From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Thu, 4 Mar 2010 14:32:16 +0000 (+0300)
Subject: ocfs2: replace inode uid,gid,mode initialization with helper function
X-Git-Tag: v3.0~4890^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75fe0a2477dab30f00c228f9a4d79009d5677bde;p=platform%2Fkernel%2Flinux-amlogic.git

ocfs2: replace inode uid,gid,mode initialization with helper function

Acked-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index db5dd3e..f171b51 100644
--- a/fs/ocfs2/namei.c
+++ b/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;
 }