Skip to content

Commit

Permalink
ext4: replace inode uid,gid,mode init with helper
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Dmitry Monakhov authored and Al Viro committed May 21, 2010
1 parent aab99c2 commit b10b852
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions fs/ext4/ialloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -979,16 +979,12 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode,
atomic_dec(&sbi->s_flex_groups[flex_group].free_inodes);
}

inode->i_uid = current_fsuid();
if (test_opt(sb, GRPID))
if (test_opt(sb, GRPID)) {
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
else 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 + group * EXT4_INODES_PER_GROUP(sb);
/* This is the optimal IO size (for stat), not the fs block size */
Expand Down

0 comments on commit b10b852

Please sign in to comment.