Commit b10b8520 authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Al Viro

ext4: replace inode uid,gid,mode init with helper

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent aab99c2c
...@@ -979,16 +979,12 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode, ...@@ -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); 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; 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 } else
inode->i_gid = current_fsgid(); inode_init_owner(inode, dir, mode);
inode->i_mode = mode;
inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb); inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb);
/* This is the optimal IO size (for stat), not the fs block size */ /* This is the optimal IO size (for stat), not the fs block size */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment