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

Commit 7cf96da3 authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Chris Mason
Browse files

Btrfs: cleanup error handling in inode.c 



The error processing of several places is changed like setting the
error number only at the error.

Signed-off-by: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 64728bbb

fs/btrfs/inode.c

+9 −6
Original line number Diff line number Diff line
@@ -4731,9 +4731,10 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry, 
	inode = btrfs_new_inode(trans, root, dir, dentry->d_name.name,

				dentry->d_name.len, dir->i_ino, objectid,

				BTRFS_I(dir)->block_group, mode, &index);

	if (IS_ERR(inode)) {

		err = PTR_ERR(inode);

	if (IS_ERR(inode))

		goto out_unlock;

	}



	err = btrfs_init_inode_security(trans, inode, dir);

	if (err) {
@@ -4792,9 +4793,10 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry, 
	inode = btrfs_new_inode(trans, root, dir, dentry->d_name.name,

				dentry->d_name.len, dir->i_ino, objectid,

				BTRFS_I(dir)->block_group, mode, &index);

	if (IS_ERR(inode)) {

		err = PTR_ERR(inode);

	if (IS_ERR(inode))

		goto out_unlock;

	}



	err = btrfs_init_inode_security(trans, inode, dir);

	if (err) {
@@ -7278,9 +7280,10 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, 
				dentry->d_name.len, dir->i_ino, objectid,

				BTRFS_I(dir)->block_group, S_IFLNK|S_IRWXUGO,

				&index);

	if (IS_ERR(inode)) {

		err = PTR_ERR(inode);

	if (IS_ERR(inode))

		goto out_unlock;

	}



	err = btrfs_init_inode_security(trans, inode, dir);

	if (err) {