author: Michael Halcrow <mhalcrow@us.ibm.com> 2007-02-12 00:53:48 -0800
committer: Linus Torvalds <torvalds@woody.linux-foundation.org> 2007-02-12 09:48:37 -0800
commit: 9d8b8ce5561890464c54645cdea4d6b157159fec
parent: 70456600f42f85cfcbdd9d7a6029c03b6f9c5d1e
Commit Summary:
Diffstat:
1 file changed, 4 insertions, 4 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 2d7db61b9d6c..b817a1a39e70 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -429,10 +429,10 @@ static int ecryptfs_read_in_page(struct ecryptfs_page_crypt_context *ctx,
goto out;
}
} else {
- rc = ecryptfs_grab_and_map_lower_page(lower_page, NULL,
- lower_inode,
- lower_page_idx);
- if (rc) {
+ *lower_page = grab_cache_page(lower_inode->i_mapping,
+ lower_page_idx);
+ if (!(*lower_page)) {
+ rc = -EINVAL;
ecryptfs_printk(
KERN_ERR, "Error attempting to grab and map "
"lower page with index [0x%.16x]; rc = [%d]\n",