From 592a522a34317ca6e116721846260e50aefd542d Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Thu, 4 Mar 2010 17:32:16 +0300
Subject: [PATCH] --- yaml --- r: 197983 b: refs/heads/master c:
 75fe0a2477dab30f00c228f9a4d79009d5677bde h: refs/heads/master i:   197981:
 1d08b094bd5ba2a466fabfc142773e9add90cb5d   197979:
 32e66332301c671592c4de18998b34a4085dc529   197975:
 b669787a6665cca70b26fde81bcdad5a46b11b05   197967:
 031ad00ffc4e80defd3ee12825ec0bef85939e6b   197951:
 7b399f4ac0afd79beb532632b31e50b080d5f88c v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/namei.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4e51aec7d6f2..bfd903c7c606 100644
--- 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
index db5dd3ed4df4..f171b51a74f7 100644
--- 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;
 }