From b669787a6665cca70b26fde81bcdad5a46b11b05 Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Thu, 4 Mar 2010 17:30:58 +0300
Subject: [PATCH] --- yaml --- r: 197975 b: refs/heads/master c:
 319b2be49e91398eae07db4dfc29972846dec649 h: refs/heads/master i:   197973:
 65db981bed1cfd03376e2778d4a4d9f014c32fa0   197971:
 bd1b12d844286f358e94aa76716342c2d3ee5a57   197967:
 031ad00ffc4e80defd3ee12825ec0bef85939e6b v: v3

---
 [refs]                   |  2 +-
 trunk/fs/jfs/jfs_inode.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index a3d01c735602..ca98f41f42e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 217f206d68e12285d55d05678e361221ebebd046
+refs/heads/master: 319b2be49e91398eae07db4dfc29972846dec649
diff --git a/trunk/fs/jfs/jfs_inode.c b/trunk/fs/jfs/jfs_inode.c
index 829921b67765..2686531e235a 100644
--- a/trunk/fs/jfs/jfs_inode.c
+++ b/trunk/fs/jfs/jfs_inode.c
@@ -98,14 +98,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
 		goto fail_unlock;
 	}
 
-	inode->i_uid = current_fsuid();
-	if (parent->i_mode & S_ISGID) {
-		inode->i_gid = parent->i_gid;
-		if (S_ISDIR(mode))
-			mode |= S_ISGID;
-	} else
-		inode->i_gid = current_fsgid();
-
+	inode_init_owner(inode, parent, mode);
 	/*
 	 * New inodes need to save sane values on disk when
 	 * uid & gid mount options are used
@@ -121,7 +114,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
 	if (rc)
 		goto fail_drop;
 
-	inode->i_mode = mode;
 	/* inherit flags from parent */
 	jfs_inode->mode2 = JFS_IP(parent)->mode2 & JFS_FL_INHERIT;
 
@@ -134,7 +126,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
 		if (S_ISLNK(mode))
 			jfs_inode->mode2 &= ~(JFS_IMMUTABLE_FL|JFS_APPEND_FL);
 	}
-	jfs_inode->mode2 |= mode;
+	jfs_inode->mode2 |= inode->i_mode;
 
 	inode->i_blocks = 0;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;