diff options
| author | Dmitry Monakhov <dmonakhov@openvz.org> | 2010-03-04 17:31:50 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-05-21 18:31:24 -0400 |
| commit | aab99c2c26f74d90f615fcca534172dfc1c8bec2 (patch) | |
| tree | 9747a677845b657549c71c298c34259984c010d6 | |
| parent | ffba102d75a2e79ac9754841c6cf4a6dd6892c42 (diff) | |
| download | linux-3.10-aab99c2c26f74d90f615fcca534172dfc1c8bec2.tar.gz linux-3.10-aab99c2c26f74d90f615fcca534172dfc1c8bec2.tar.bz2 linux-3.10-aab99c2c26f74d90f615fcca534172dfc1c8bec2.zip | |
ext3: replace inode uid,gid,mode init with helper
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/ext3/ialloc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 0d0e97ed3ff..498021eb88f 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c @@ -538,16 +538,13 @@ got: if (S_ISDIR(mode)) percpu_counter_inc(&sbi->s_dirs_counter); - inode->i_uid = current_fsuid(); - if (test_opt (sb, GRPID)) - inode->i_gid = dir->i_gid; - else if (dir->i_mode & S_ISGID) { + + if (test_opt(sb, GRPID)) { + inode->i_mode = mode; + inode->i_uid = current_fsuid(); 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; /* This is the optimal IO size (for stat), not the fs block size */ |