diff options
| author | Hongbo Li <lihongbo22@huawei.com> | 2024-08-16 14:38:49 +0800 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-08-30 08:22:37 +0200 |
| commit | 1aeb6defd11f28cf5d474f0a00875323c0d143b3 (patch) | |
| tree | d0a940aa7e35175f21757079e1e1a1fe362931af | |
| parent | b381fbbccb4cb60aefa1ab7f8e3766ddb4a461db (diff) | |
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>
| -rw-r--r-- | fs/posix_acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 3f87297dbfdb..6c66a37522d0 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -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; |