Don't we also need to handle the new return value in a few other places like cachefiles_read_reissue swap_readpage? Maybe those don't get called on the currently converted instances, but just leaving them without handling AOP_UPDATED_PAGE seems like a time bomb.
