Commit 4d833bef authored by Alexander Mikhalitsyn's avatar Alexander Mikhalitsyn Committed by Miklos Szeredi
Browse files

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: default avatarAlexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 276a0256

fs/fuse/acl.c

+2 −4
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/posix_acl_xattr.h>



static struct posix_acl *__fuse_get_acl(struct fuse_conn *fc,

					struct mnt_idmap *idmap,

					struct inode *inode, int type, bool rcu)

{

	int size;
@@ -74,7 +73,7 @@ struct posix_acl *fuse_get_acl(struct mnt_idmap *idmap, 
	if (fuse_no_acl(fc, inode))

		return ERR_PTR(-EOPNOTSUPP);



	return __fuse_get_acl(fc, idmap, inode, type, false);

	return __fuse_get_acl(fc, inode, type, false);

}



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) 
	 */

	if (!fc->posix_acl)

		return NULL;



	return __fuse_get_acl(fc, &nop_mnt_idmap, inode, type, rcu);

	return __fuse_get_acl(fc,  inode, type, rcu);

}



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