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;