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; }