Commit 1aeb6def authored by Hongbo Li's avatar Hongbo Li Committed by Christian Brauner
Browse files

fs: Use in_group_or_capable() helper to simplify the code 



Since in_group_or_capable has been exported, we can use
it to simplify the code when check group and capable.

Signed-off-by: default avatarHongbo Li <lihongbo22@huawei.com>
Link: https://lore.kernel.org/r/20240816063849.1989856-1-lihongbo22@huawei.com


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent b381fbbc

fs/posix_acl.c

+2 −2
Original line number Diff line number Diff line
@@ -715,8 +715,8 @@ int posix_acl_update_mode(struct mnt_idmap *idmap, 
		return error;

	if (error == 0)

		*acl = NULL;

	if (!vfsgid_in_group_p(i_gid_into_vfsgid(idmap, inode)) &&

	    !capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID))

	if (!in_group_or_capable(idmap, inode,

				 i_gid_into_vfsgid(idmap, inode)))

		mode &= ~S_ISGID;

	*mode_p = mode;

	return 0;