---

yaml --- r: 197983 b: refs/heads/master c: 75fe0a2 h: refs/heads/master i: 197981: 1d08b09 197979: 32e6633 197975: b669787 197967: 031ad00 197951: 7b399f4 v: v3
git-mirror · May 21, 2010 · 592a522 · 592a522
1 parent 0505db1
commit 592a522
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73459dcc67e77aa5cb28d51b2d84dd145977ace3
+refs/heads/master: 75fe0a2477dab30f00c228f9a4d79009d5677bde
diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c
@@ -204,14 +204,7 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode)
 		inode->i_nlink = 2;
 	else
 		inode->i_nlink = 1;
-	inode->i_uid = current_fsuid();
-	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);
 	dquot_initialize(inode);
 	return inode;
 }