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: Hongbo Li <lihongbo22@huawei.com>
Link: https://lore.kernel.org/r/20240816063849.1989856-1-lihongbo22@huawei.com
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Hongbo Li 2024-08-16 14:38:49 +08:00 committed by Christian Brauner
parent b381fbbccb
commit 1aeb6defd1

View File

@ -715,8 +715,8 @@ int posix_acl_update_mode(struct mnt_idmap *idmap,
return error; return error;
if (error == 0) if (error == 0)
*acl = NULL; *acl = NULL;
if (!vfsgid_in_group_p(i_gid_into_vfsgid(idmap, inode)) && if (!in_group_or_capable(idmap, inode,
!capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID)) i_gid_into_vfsgid(idmap, inode)))
mode &= ~S_ISGID; mode &= ~S_ISGID;
*mode_p = mode; *mode_p = mode;
return 0; return 0;