[PATCH] ecryptfs: check xattr operation support fix

  - 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@openvz.org>
Acked-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 5 insertions, 4 deletions

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 0cfff4fefa9e..e62f3fc7241e 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 7be8e91b5ba0..7def4be83e61 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -502,7 +502,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;