ocfs2: replace inode uid,gid,mode initialization with helper function
authorDmitry Monakhov <dmonakhov@openvz.org>
Thu, 4 Mar 2010 14:32:16 +0000 (17:32 +0300)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 21 May 2010 22:31:25 +0000 (18:31 -0400)
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>
fs/ocfs2/namei.c

index db5dd3ed4df4a5553d7cc7179bbf3a48232825d4..f171b51a74f78d6e268b5d743a24df4e702f9643 100644 (file)
@@ -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;
 }