Commit bef5bc24 authored by Al Viro's avatar Al Viro

simplify access to ecryptfs inodes in ->readpage() and friends

we can get to them from page->mapping->host, no need to mess with
file.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f6d335c0
...@@ -198,7 +198,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, ...@@ -198,7 +198,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
static int ecryptfs_readpage(struct file *file, struct page *page) static int ecryptfs_readpage(struct file *file, struct page *page)
{ {
struct ecryptfs_crypt_stat *crypt_stat = 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; int rc = 0;
if (!crypt_stat if (!crypt_stat
...@@ -300,8 +300,7 @@ static int ecryptfs_write_begin(struct file *file, ...@@ -300,8 +300,7 @@ static int ecryptfs_write_begin(struct file *file,
if (!PageUptodate(page)) { if (!PageUptodate(page)) {
struct ecryptfs_crypt_stat *crypt_stat = struct ecryptfs_crypt_stat *crypt_stat =
&ecryptfs_inode_to_private( &ecryptfs_inode_to_private(mapping->host)->crypt_stat;
file->f_path.dentry->d_inode)->crypt_stat;
if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED) if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)
|| (crypt_stat->flags & ECRYPTFS_NEW_FILE)) { || (crypt_stat->flags & ECRYPTFS_NEW_FILE)) {
...@@ -487,7 +486,7 @@ static int ecryptfs_write_end(struct file *file, ...@@ -487,7 +486,7 @@ static int ecryptfs_write_end(struct file *file,
unsigned to = from + copied; unsigned to = from + copied;
struct inode *ecryptfs_inode = mapping->host; struct inode *ecryptfs_inode = mapping->host;
struct ecryptfs_crypt_stat *crypt_stat = 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; int rc;
if (crypt_stat->flags & ECRYPTFS_NEW_FILE) { if (crypt_stat->flags & ECRYPTFS_NEW_FILE) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment