Skip to content

Commit 4d833be

Browse files
mihalicynMiklos Szeredi
authored andcommitted
fuse: drop idmap argument from __fuse_get_acl
We don't need to have idmap in the __fuse_get_acl as we don't have any use for it. In the current POSIX ACL implementation, idmapped mounts are taken into account on the userspace/kernel border (see vfs_set_acl_idmapped_mnt() and vfs_posix_acl_to_xattr()). Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com> Reviewed-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
1 parent 276a025 commit 4d833be

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

fs/fuse/acl.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/posix_acl_xattr.h>
1313

1414
static struct posix_acl *__fuse_get_acl(struct fuse_conn *fc,
15-
struct mnt_idmap *idmap,
1615
struct inode *inode, int type, bool rcu)
1716
{
1817
int size;
@@ -74,7 +73,7 @@ struct posix_acl *fuse_get_acl(struct mnt_idmap *idmap,
7473
if (fuse_no_acl(fc, inode))
7574
return ERR_PTR(-EOPNOTSUPP);
7675

77-
return __fuse_get_acl(fc, idmap, inode, type, false);
76+
return __fuse_get_acl(fc, inode, type, false);
7877
}
7978

8079
struct posix_acl *fuse_get_inode_acl(struct inode *inode, int type, bool rcu)
@@ -90,8 +89,7 @@ struct posix_acl *fuse_get_inode_acl(struct inode *inode, int type, bool rcu)
9089
*/
9190
if (!fc->posix_acl)
9291
return NULL;
93-
94-
return __fuse_get_acl(fc, &nop_mnt_idmap, inode, type, rcu);
92+
return __fuse_get_acl(fc, inode, type, rcu);
9593
}
9694

9795
int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

0 commit comments

Comments
 (0)