Merge git://github.com/Paragon-Software-Group/linux-ntfs3

[linux-2.6-microblaze.git] / fs / ntfs3 / xattr.c

diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c
index b15d532..7282d85 100644 (file)
--- a/fs/ntfs3/xattr.c
+++ b/fs/ntfs3/xattr.c
@@ -535,8 +535,11 @@ static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns,
 /*
  * ntfs_get_acl - inode_operations::get_acl
  */
-struct posix_acl *ntfs_get_acl(struct inode *inode, int type)
+struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu)
 {
+       if (rcu)
+               return ERR_PTR(-ECHILD);
+
        /* TODO: init_user_ns? */
        return ntfs_get_acl_ex(&init_user_ns, inode, type, 0);
 }
@@ -635,7 +638,7 @@ static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns,
                return -EOPNOTSUPP;
        }
 
-       acl = ntfs_get_acl(inode, type);
+       acl = ntfs_get_acl(inode, type, false);
        if (IS_ERR(acl))
                return PTR_ERR(acl);