From ba3d3fdd4b0e21eb7f40217f73f4e4be82dc26b3 Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Thu, 4 Mar 2010 17:32:23 +0300
Subject: [PATCH] --- yaml --- r: 197991 b: refs/heads/master c:
 be8ded5974c69d0d2128a508b0900ef541d0e7da h: refs/heads/master i:   197989:
 43e1e83cdde292aee0db2996240b288300c29da3   197987:
 43013fd7c9b95e7fc4b8879b2ae3aa13bf50e8aa   197983:
 592a522a34317ca6e116721846260e50aefd542d v: v3

---
 [refs]                |  2 +-
 trunk/fs/ufs/ialloc.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 443d017f30d5..0ea2adc7b779 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6c5a0342a95f9c7cf18adef79ca52a35cd5e4da
+refs/heads/master: be8ded5974c69d0d2128a508b0900ef541d0e7da
diff --git a/trunk/fs/ufs/ialloc.c b/trunk/fs/ufs/ialloc.c
index 230ecf608026..3a959d55084d 100644
--- a/trunk/fs/ufs/ialloc.c
+++ b/trunk/fs/ufs/ialloc.c
@@ -303,15 +303,7 @@ struct inode * ufs_new_inode(struct inode * dir, int mode)
 	sb->s_dirt = 1;
 
 	inode->i_ino = cg * uspi->s_ipg + bit;
-	inode->i_mode = mode;
-	inode->i_uid = current_fsuid();
-	if (dir->i_mode & S_ISGID) {
-		inode->i_gid = dir->i_gid;
-		if (S_ISDIR(mode))
-			inode->i_mode |= S_ISGID;
-	} else
-		inode->i_gid = current_fsgid();
-
+	inode_init_owner(inode, dir, mode);
 	inode->i_blocks = 0;
 	inode->i_generation = 0;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;