From 3dac67837b5a3a3da567c2413b0f1f81591ae6d8 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 21 May 2010 10:56:12 -0400 Subject: [PATCH] --- yaml --- r: 197995 b: refs/heads/master c: bef5bc2464517cbbf8f85f09b5ade46904afec9a h: refs/heads/master i: 197993: f4ce3c2dba928e9f31736465de24421c88142c08 197991: ba3d3fdd4b0e21eb7f40217f73f4e4be82dc26b3 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/mmap.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 43bf8dd40061..669fff220b87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6d335c08df48b318187a087c9c38ba3d416e115 +refs/heads/master: bef5bc2464517cbbf8f85f09b5ade46904afec9a diff --git a/trunk/fs/ecryptfs/mmap.c b/trunk/fs/ecryptfs/mmap.c index 2ee9a3a7b68c..14e81c26c3ed 100644 --- a/trunk/fs/ecryptfs/mmap.c +++ b/trunk/fs/ecryptfs/mmap.c @@ -198,7 +198,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, static int ecryptfs_readpage(struct file *file, struct page *page) { struct ecryptfs_crypt_stat *crypt_stat = - &ecryptfs_inode_to_private(file->f_path.dentry->d_inode)->crypt_stat; + &ecryptfs_inode_to_private(page->mapping->host)->crypt_stat; int rc = 0; if (!crypt_stat @@ -300,8 +300,7 @@ static int ecryptfs_write_begin(struct file *file, if (!PageUptodate(page)) { struct ecryptfs_crypt_stat *crypt_stat = - &ecryptfs_inode_to_private( - file->f_path.dentry->d_inode)->crypt_stat; + &ecryptfs_inode_to_private(mapping->host)->crypt_stat; if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED) || (crypt_stat->flags & ECRYPTFS_NEW_FILE)) { @@ -487,7 +486,7 @@ static int ecryptfs_write_end(struct file *file, unsigned to = from + copied; struct inode *ecryptfs_inode = mapping->host; struct ecryptfs_crypt_stat *crypt_stat = - &ecryptfs_inode_to_private(file->f_path.dentry->d_inode)->crypt_stat; + &ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat; int rc; if (crypt_stat->flags & ECRYPTFS_NEW_FILE) {