commit ffba102d75a2e79ac9754841c6cf4a6dd6892c42
author Dmitry Monakhov <dmonakhov@openvz.org> Thu Mar 04 17:31:49 2010 +0300
committer Al Viro <viro@zeniv.linux.org.uk> Fri May 21 18:31:24 2010 -0400
tree b7bb51be713a8b665ac97f53ec5872f9abaa9e9c
parent e00117f14f68d9e54c8aa3d52ebdc76cdbbc4f87

ext2: 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>

fs/ext2/ialloc.c

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index f0c5286..938dbc7 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -549,16 +549,12 @@
 
 	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;