diff --git a/[refs] b/[refs] index 4beb704c7e55..4e51aec7d6f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9eed1fb721c6c512795f8847bccc413f3a1143bb +refs/heads/master: 73459dcc67e77aa5cb28d51b2d84dd145977ace3 diff --git a/trunk/fs/nilfs2/inode.c b/trunk/fs/nilfs2/inode.c index 5e226d4b41d3..39e038ac8fcb 100644 --- a/trunk/fs/nilfs2/inode.c +++ b/trunk/fs/nilfs2/inode.c @@ -280,16 +280,7 @@ struct inode *nilfs_new_inode(struct inode *dir, int mode) /* reference count of i_bh inherits from nilfs_mdt_read_block() */ atomic_inc(&sbi->s_inodes_count); - - 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); inode->i_ino = ino; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;