Commit 8c087b51 authored by Chris Ball's avatar Chris Ball Committed by Chris Mason

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: default avatarChris Ball <cjb@laptop.org>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent bd56b302
...@@ -3472,7 +3472,14 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, ...@@ -3472,7 +3472,14 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
root->highest_inode = objectid; root->highest_inode = objectid;
inode->i_uid = current_fsuid(); inode->i_uid = current_fsuid();
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_gid = current_fsgid();
inode->i_mode = mode; inode->i_mode = mode;
inode->i_ino = objectid; inode->i_ino = objectid;
inode_set_bytes(inode, 0); inode_set_bytes(inode, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment