fs: port ->set_acl() to pass mnt_idmap

[linux-block.git] / fs / ecryptfs / inode.c

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 8487ac0cc2395110aa8337ab84fed2872b0cf16b..b62351b7ad6a49fd4095aec4124f963621f21026 100644 (file)
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -1129,7 +1129,7 @@ static struct posix_acl *ecryptfs_get_acl(struct mnt_idmap *idmap,
                           posix_acl_xattr_name(type));
 }
 
-static int ecryptfs_set_acl(struct user_namespace *mnt_userns,
+static int ecryptfs_set_acl(struct mnt_idmap *idmap,
                            struct dentry *dentry, struct posix_acl *acl,
                            int type)
 {
@@ -1137,7 +1137,7 @@ static int ecryptfs_set_acl(struct user_namespace *mnt_userns,
        struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
        struct inode *lower_inode = d_inode(lower_dentry);
 
-       rc = vfs_set_acl(&init_user_ns, lower_dentry,
+       rc = vfs_set_acl(&nop_mnt_idmap, lower_dentry,
                         posix_acl_xattr_name(type), acl);
        if (!rc)
                fsstack_copy_attr_all(d_inode(dentry), lower_inode);