Skip to content

Commit

Permalink
simplify access to ecryptfs inodes in ->readpage() and friends
Browse files Browse the repository at this point in the history
we can get to them from page->mapping->host, no need to mess with
file.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed May 21, 2010
1 parent f6d335c commit bef5bc2
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions fs/ecryptfs/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit bef5bc2

Please sign in to comment.