Skip to content

Commit

Permalink
ext3: 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 ffba102 commit aab99c2
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions fs/ext3/ialloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,16 +538,13 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode)
if (S_ISDIR(mode))
percpu_counter_inc(&sbi->s_dirs_counter);

inode->i_uid = current_fsuid();
if (test_opt (sb, GRPID))
inode->i_gid = dir->i_gid;
else if (dir->i_mode & S_ISGID) {

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

0 comments on commit aab99c2

Please sign in to comment.