Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffba102d authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Al Viro
Browse files

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



Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e00117f1

fs/ext2/ialloc.c

+4 −8
Original line number Diff line number Diff line
@@ -549,16 +549,12 @@ struct inode *ext2_new_inode(struct inode *dir, int mode) 


	sb->s_dirt = 1;

	mark_buffer_dirty(bh2);

	if (test_opt(sb, GRPID)) {

		inode->i_mode = mode;

		inode->i_uid = current_fsuid();

	if (test_opt (sb, GRPID))

		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;