mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
ceph: rely on vfs for setgid stripping
Now that we finished moving setgid stripping for regular files in setgid directories into the vfs, individual filesystem don't need to manually strip the setgid bit anymore. Drop the now unneeded code from ceph. Link: https://lore.kernel.org/r/1657779088-2242-4-git-send-email-xuyang2018.jy@fujitsu.com Reviewed-by: Xiubo Li <xiubli@redhat.com> Reviewed-by: Christian Brauner (Microsoft)<brauner@kernel.org> Reviewed-and-Tested-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
This commit is contained in:
parent
1639a49ccd
commit
5fadbd9929
@ -657,10 +657,6 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry,
|
||||
/* Directories always inherit the setgid bit. */
|
||||
if (S_ISDIR(mode))
|
||||
mode |= S_ISGID;
|
||||
else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
|
||||
!in_group_p(dir->i_gid) &&
|
||||
!capable_wrt_inode_uidgid(&init_user_ns, dir, CAP_FSETID))
|
||||
mode &= ~S_ISGID;
|
||||
} else {
|
||||
in.gid = cpu_to_le32(from_kgid(&init_user_ns, current_fsgid()));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user