diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2012-05-04 14:33:06 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-05-04 14:33:06 +0100 |
| commit | f9425ad4e5c8f8f9f6297d0358dc44ca058ffe47 (patch) | |
| tree | 5fad05178af7a4e2ccd21d63938a3559a60a353f /fs/gfs2/acl.c | |
| parent | c0752aa7e4d48cc19e167ccb0092bea8e5b6ca3a (diff) | |
| download | op-kernel-dev-f9425ad4e5c8f8f9f6297d0358dc44ca058ffe47.zip op-kernel-dev-f9425ad4e5c8f8f9f6297d0358dc44ca058ffe47.tar.gz | |
GFS2: Fix sgid propagation when using ACLs
This cleans up the mode setting code when creating inodes. The
SGID bit was being reset by setattr_copy() when the user creating a
subdirectory was not in the owning group. When ACLs are in use this
SGID bit should have been propagated if the ACL allows creation of
a subdirectory. GFS2's behaviour now matches that of the other ACL
supporting filesystems in this regard.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/acl.c')
| -rw-r--r-- | fs/gfs2/acl.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c index 230eb0f..bd4a589 100644 --- a/fs/gfs2/acl.c +++ b/fs/gfs2/acl.c @@ -73,12 +73,8 @@ static int gfs2_set_mode(struct inode *inode, umode_t mode) int error = 0; if (mode != inode->i_mode) { - struct iattr iattr; - - iattr.ia_valid = ATTR_MODE; - iattr.ia_mode = mode; - - error = gfs2_setattr_simple(inode, &iattr); + inode->i_mode = mode; + mark_inode_dirty(inode); } return error; @@ -126,9 +122,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode) return PTR_ERR(acl); if (!acl) { mode &= ~current_umask(); - if (mode != inode->i_mode) - error = gfs2_set_mode(inode, mode); - return error; + return gfs2_set_mode(inode, mode); } if (S_ISDIR(inode->i_mode)) { |
