f2fs: Use in_group_or_capable() helper

Use the in_group_or_capable() helper function to simplify the code.

Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
Link: https://lore.kernel.org/r/20240620032335.147136-2-youling.tang@linux.dev
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index ec2aeccb69a3abe562dfb89c32aa3d98e4bdad67..8bffdeccdbc3cb95a8d187fdc886ff68af1c6e3a 100644 (file)
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -219,8 +219,7 @@ static int f2fs_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;

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 5c0b281a70f3e48fa8380fd93dad69e2e53b75b2..7a23434963d1711f22964a8ae591df8bdcbb65b8 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -923,10 +923,8 @@ static void __setattr_copy(struct mnt_idmap *idmap,
                inode_set_ctime_to_ts(inode, attr->ia_ctime);
        if (ia_valid & ATTR_MODE) {
                umode_t mode = attr->ia_mode;
-               vfsgid_t vfsgid = i_gid_into_vfsgid(idmap, inode);
 
-               if (!vfsgid_in_group_p(vfsgid) &&
-                   !capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID))
+               if (!in_group_or_capable(idmap, inode, i_gid_into_vfsgid(idmap, inode)))
                        mode &= ~S_ISGID;
                set_acl_inode(inode, mode);
        }