From: Youling Tang <youling.tang@linux.dev>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>,
Miklos Szeredi <miklos@szeredi.hu>
Cc: Youling Tang <tangyouling@kylinos.cn>, Jan Kara <jack@suse.cz>,
linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net, youling.tang@linux.dev,
linux-fsdevel@vger.kernel.org
Subject: [f2fs-dev] [PATCH 3/3] fuse: Use in_group_or_capable() helper
Date: Thu, 20 Jun 2024 11:23:35 +0800 [thread overview]
Message-ID: <20240620032335.147136-3-youling.tang@linux.dev> (raw)
In-Reply-To: <20240620032335.147136-1-youling.tang@linux.dev>
From: Youling Tang <tangyouling@kylinos.cn>
Use the in_group_or_capable() helper function to simplify the code.
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
---
fs/fuse/acl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/fuse/acl.c b/fs/fuse/acl.c
index 3d192b80a561..04cfd8fee992 100644
--- a/fs/fuse/acl.c
+++ b/fs/fuse/acl.c
@@ -146,8 +146,8 @@ int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
* be stripped.
*/
if (fc->posix_acl &&
- !vfsgid_in_group_p(i_gid_into_vfsgid(&nop_mnt_idmap, inode)) &&
- !capable_wrt_inode_uidgid(&nop_mnt_idmap, inode, CAP_FSETID))
+ !in_group_or_capable(&nop_mnt_idmap, inode,
+ i_gid_into_vfsgid(&nop_mnt_idmap, inode)))
extra_flags |= FUSE_SETXATTR_ACL_KILL_SGID;
ret = fuse_setxattr(inode, name, value, size, 0, extra_flags);
--
2.34.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
WARNING: multiple messages have this Message-ID (diff)
From: Youling Tang <youling.tang@linux.dev>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>,
Miklos Szeredi <miklos@szeredi.hu>
Cc: Jan Kara <jack@suse.cz>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net, youling.tang@linux.dev,
Youling Tang <tangyouling@kylinos.cn>
Subject: [PATCH 3/3] fuse: Use in_group_or_capable() helper
Date: Thu, 20 Jun 2024 11:23:35 +0800 [thread overview]
Message-ID: <20240620032335.147136-3-youling.tang@linux.dev> (raw)
In-Reply-To: <20240620032335.147136-1-youling.tang@linux.dev>
From: Youling Tang <tangyouling@kylinos.cn>
Use the in_group_or_capable() helper function to simplify the code.
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
---
fs/fuse/acl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/fuse/acl.c b/fs/fuse/acl.c
index 3d192b80a561..04cfd8fee992 100644
--- a/fs/fuse/acl.c
+++ b/fs/fuse/acl.c
@@ -146,8 +146,8 @@ int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
* be stripped.
*/
if (fc->posix_acl &&
- !vfsgid_in_group_p(i_gid_into_vfsgid(&nop_mnt_idmap, inode)) &&
- !capable_wrt_inode_uidgid(&nop_mnt_idmap, inode, CAP_FSETID))
+ !in_group_or_capable(&nop_mnt_idmap, inode,
+ i_gid_into_vfsgid(&nop_mnt_idmap, inode)))
extra_flags |= FUSE_SETXATTR_ACL_KILL_SGID;
ret = fuse_setxattr(inode, name, value, size, 0, extra_flags);
--
2.34.1
next prev parent reply other threads:[~2024-06-20 3:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 3:23 [f2fs-dev] [PATCH 1/3] fs: Export in_group_or_capable() Youling Tang
2024-06-20 3:23 ` Youling Tang
2024-06-20 3:23 ` [f2fs-dev] [PATCH 2/3] f2fs: Use in_group_or_capable() helper Youling Tang
2024-06-20 3:23 ` Youling Tang
2024-06-20 3:23 ` Youling Tang [this message]
2024-06-20 3:23 ` [PATCH 3/3] fuse: " Youling Tang
2024-06-20 14:03 ` [f2fs-dev] [PATCH 1/3] fs: Export in_group_or_capable() Christian Brauner
2024-06-20 14:03 ` Christian Brauner
2024-07-24 2:16 ` [f2fs-dev] " patchwork-bot+f2fs
2024-07-24 2:16 ` patchwork-bot+f2fs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240620032335.147136-3-youling.tang@linux.dev \
--to=youling.tang@linux.dev \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=jack@suse.cz \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=tangyouling@kylinos.cn \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.