[PATCH] ecryptfs: check xattr operation support fix

From: Dmitriy Monakhov <dmonakhov@xxxxx>
Date: Wed, 28 Feb 2007 20:05:16 +0300

- ecryptfs_write_inode_size_to_metadata() error code was ignored.
- i_op->setxattr() must be supported by lower fs because used below.

Signed-off-by: Monakhov Dmitriy <dmonakhov@xxxxxxxxxx>
---
fs/ecryptfs/inode.c | 6 +++---
fs/ecryptfs/mmap.c | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 27fd14a..9ccefad 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -168,9 +168,9 @@ static int grow_file(struct dentry *ecryptfs_dentry, struct file *lower_file,
goto out;
}
i_size_write(inode, 0);
- ecryptfs_write_inode_size_to_metadata(lower_file, lower_inode, inode,
- ecryptfs_dentry,
- ECRYPTFS_LOWER_I_MUTEX_NOT_HELD);
+ rc = ecryptfs_write_inode_size_to_metadata(lower_file, lower_inode,
+ inode, ecryptfs_dentry,
+ ECRYPTFS_LOWER_I_MUTEX_NOT_HELD);
ecryptfs_inode_to_private(inode)->crypt_stat.flags |= ECRYPTFS_NEW_FILE;
out:
return rc;
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 1e5d2ba..416985f 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -491,7 +491,8 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *lower_inode,
goto out;
}
lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry);
- if (!lower_dentry->d_inode->i_op->getxattr) {
+ if (!lower_dentry->d_inode->i_op->getxattr ||
+ !lower_dentry->d_inode->i_op->setxattr) {
printk(KERN_WARNING
"No support for setting xattr in lower filesystem\n");
rc = -ENOSYS;
--
1.5.0.1

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Follow-Ups:
- Re: [PATCH] ecryptfs: check xattr operation support fix
  - From: Michael Halcrow

Prev by Date: Re: lanana: Add major/minor entries for PPC QE UART devices
Next by Date: Re: [patch 01/22] update ctime and mtime for mmaped write
Previous by thread: [PATCH 2.6.21-rc2] ehca: fix mismatched sync between completion handler and destroy cq
Next by thread: Re: [PATCH] ecryptfs: check xattr operation support fix
Index(es):
- Date
- Thread

Relevant Pages

Re: synchronize_qrcu_timeout()
... int idx, prv; ... goto out; ... More majordomo info at
http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/
... (Linux-Kernel)
Re: [PATCH 3/10] configfs: use size_t length modifier in pr_debug format argument
... goto out; ... More majordomo info at http://vger.kernel.org/majordomo-info.html
... Please read the FAQ at http://www.tux.org/lkml/ ... Principal Software Developer
... (Linux-Kernel)
Re: [patch 14/23] x86 microcode: dont check the size
... microcode update whose size is 1024 bytes. ... goto out; ... More
majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ
at http://www.tux.org/lkml/ ... (Linux-Kernel)
Re: [patch 14/23] x86 microcode: dont check the size
... microcode update whose size is 1024 bytes. ... goto out; ... More
majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ
at http://www.tux.org/lkml/ ... (Linux-Kernel)
[PATCH 2/2] ext2: remove pointless vars in inode allocators
... best_desc is updated in a loop and eventually ... goto found; ...
More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ
at http://www.tux.org/lkml/ ... (Linux-Kernel)