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

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

udf: 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 abf5d08a

fs/udf/ialloc.c

+2 −9
Original line number Diff line number Diff line
@@ -124,15 +124,8 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) 
		udf_updated_lvid(sb);

	}

	mutex_unlock(&sbi->s_alloc_mutex);

	inode->i_mode = mode;

	inode->i_uid = current_fsuid();

	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_init_owner(inode, dir, mode);



	iinfo->i_location.logicalBlockNum = block;

	iinfo->i_location.partitionReferenceNum =

fs/udf/namei.c

+2 −8
Original line number Diff line number Diff line
@@ -579,7 +579,6 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode, 
		inode->i_data.a_ops = &udf_aops;

	inode->i_op = &udf_file_inode_operations;

	inode->i_fop = &udf_file_operations;

	inode->i_mode = mode;

	mark_inode_dirty(inode);



	fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err);
@@ -627,7 +626,6 @@ static int udf_mknod(struct inode *dir, struct dentry *dentry, int mode, 
		goto out;



	iinfo = UDF_I(inode);

	inode->i_uid = current_fsuid();

	init_special_inode(inode, mode, rdev);

	fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err);

	if (!fi) {
@@ -674,7 +672,7 @@ static int udf_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
		goto out;



	err = -EIO;

	inode = udf_new_inode(dir, S_IFDIR, &err);

	inode = udf_new_inode(dir, S_IFDIR | mode, &err);

	if (!inode)

		goto out;
@@ -697,9 +695,6 @@ static int udf_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
			FID_FILE_CHAR_DIRECTORY | FID_FILE_CHAR_PARENT;

	udf_write_fi(inode, &cfi, fi, &fibh, NULL, NULL);

	brelse(fibh.sbh);

	inode->i_mode = S_IFDIR | mode;

	if (dir->i_mode & S_ISGID)

		inode->i_mode |= S_ISGID;

	mark_inode_dirty(inode);



	fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err);
@@ -912,7 +907,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, 
	dquot_initialize(dir);



	lock_kernel();

	inode = udf_new_inode(dir, S_IFLNK, &err);

	inode = udf_new_inode(dir, S_IFLNK | S_IRWXUGO, &err);

	if (!inode)

		goto out;
@@ -923,7 +918,6 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, 
	}



	iinfo = UDF_I(inode);

	inode->i_mode = S_IFLNK | S_IRWXUGO;

	inode->i_data.a_ops = &udf_symlink_aops;

	inode->i_op = &udf_symlink_inode_operations;