summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--fs/inode.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 1d1a957..3844c31 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2003,14 +2003,8 @@ void inode_init_owner(struct inode *inode, const struct inode *dir,
inode->i_uid = current_fsuid();
if (dir && dir->i_mode & S_ISGID) {
inode->i_gid = dir->i_gid;
-
- /* Directories are special, and always inherit S_ISGID */
if (S_ISDIR(mode))
mode |= S_ISGID;
- else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
- !in_group_p(inode->i_gid) &&
- !capable_wrt_inode_uidgid(dir, CAP_FSETID))
- mode &= ~S_ISGID;
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;