Btrfs: Handle SGID bit when creating inodes

Before this patch, new files/dirs would ignore the SGID bit on their parent directory and always be owned by the creating user's uid/gid. Signed-off-by: Chris Ball <[email protected]> Signed-off-by: Chris Mason <[email protected]>
mrcsosa · Feb 4, 2009 · 8c087b5 · 8c087b5
1 parent bd56b30
commit 8c087b5
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
@@ -3472,7 +3472,14 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 		root->highest_inode = objectid;
 
 	inode->i_uid = current_fsuid();
-	inode->i_gid = current_fsgid();
+
+	if (dir->i_mode & S_ISGID) {
+		inode->i_gid = dir->i_gid;
+		if (S_ISDIR(mode))
+			mode |= S_ISGID;
+	} else
+		inode->i_gid = current_fsgid();
+
 	inode->i_mode = mode;
 	inode->i_ino = objectid;
 	inode_set_bytes(inode, 0);