| Message ID | 87vddv9ggc.fsf_-_@openvz.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu 18-02-10 10:00:03, Dmitry Monakhov wrote: > > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Looks good. Acked-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext2/ialloc.c | 12 ++++-------- > 1 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c > index 15387c9..2c484c6 100644 > --- a/fs/ext2/ialloc.c > +++ b/fs/ext2/ialloc.c > @@ -550,16 +550,12 @@ got: > > sb->s_dirt = 1; > mark_buffer_dirty(bh2); > - inode->i_uid = current_fsuid(); > - if (test_opt (sb, GRPID)) > + if (test_opt(sb, GRPID)) { > + inode->i_mode = mode; > + inode->i_uid = current_fsuid(); > inode->i_gid = dir->i_gid; > - else 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_init_owner(inode, dir, mode); > > inode->i_ino = ino; > inode->i_blocks = 0; > -- > 1.6.6 >
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index 15387c9..2c484c6 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c @@ -550,16 +550,12 @@ got: sb->s_dirt = 1; mark_buffer_dirty(bh2); - inode->i_uid = current_fsuid(); - if (test_opt (sb, GRPID)) + if (test_opt(sb, GRPID)) { + inode->i_mode = mode; + inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; - else 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_init_owner(inode, dir, mode); inode->i_ino = ino; inode->i_blocks = 0;
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ext2/ialloc.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)