From 3e67e32d144f69f2582042ac699b2146e1413552 Mon Sep 17 00:00:00 2001 From: Dmitry Monakhov Date: Thu, 4 Mar 2010 17:32:20 +0300 Subject: [PATCH] --- yaml --- r: 197988 b: refs/heads/master c: 85640bd9d47f6ad0290558009e9313632a45861b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/sysv/ialloc.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 691bc3a9e9a1..975e6bb4c3e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04b7ed0d33eee161b223d64f16e1f521a84ace76 +refs/heads/master: 85640bd9d47f6ad0290558009e9313632a45861b diff --git a/trunk/fs/sysv/ialloc.c b/trunk/fs/sysv/ialloc.c index 241e9765cfad..bbd69bdb0fa8 100644 --- a/trunk/fs/sysv/ialloc.c +++ b/trunk/fs/sysv/ialloc.c @@ -159,15 +159,7 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode) *sbi->s_sb_fic_count = cpu_to_fs16(sbi, count); fs16_add(sbi, sbi->s_sb_total_free_inodes, -1); dirty_sb(sb); - - 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_uid = current_fsuid(); + inode_init_owner(inode, dir, mode); inode->i_ino = fs16_to_cpu(sbi, ino); inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; inode->i_blocks = 0; @@ -176,7 +168,6 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode) insert_inode_hash(inode); mark_inode_dirty(inode); - inode->i_mode = mode; /* for sysv_write_inode() */ sysv_write_inode(inode, 0); /* ensure inode not allocated again */ mark_inode_dirty(inode); /* cleared by sysv_write_inode() */ /* That's it. */