Skip to content

Commit

Permalink
ext2: replace inode uid,gid,mode init with helper
Browse files Browse the repository at this point in the history
Acked-by: Jan Kara <jack@suse.cz>
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 e00117f commit ffba102
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions fs/ext2/ialloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -549,16 +549,12 @@ struct inode *ext2_new_inode(struct inode *dir, int mode)

sb->s_dirt = 1;
mark_buffer_dirty(bh2);
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;
inode->i_blocks = 0;
Expand Down

0 comments on commit ffba102

Please sign in to comment.