ext2: replace inode uid,gid,mode init with helper
Dmitry Monakhov [Thu, 4 Mar 2010 14:31:49 +0000 (17:31 +0300)]
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>

fs/ext2/ialloc.c

index f0c5286..938dbc7 100644 (file)
@@ -549,16 +549,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;