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

Commit 30d133fc authored by Liu Bo's avatar Liu Bo Committed by Chris Mason
Browse files

Btrfs: fixup error path in __btrfs_inc_extent_ref 



When we fail to add a reference after a non-inline insertion by some reasons,
eg. ENOSPC, we'll abort the transaction, but we don't return this error to
the caller who has to walk around again to find something wrong, that's
unnecessary.

Also fixup other error paths to keep it simple.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent e649e587

fs/btrfs/extent-tree.c

+2 −8
Original line number Diff line number Diff line
@@ -1979,7 +1979,6 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
	struct btrfs_extent_item *item;

	u64 refs;

	int ret;

	int err = 0;



	path = btrfs_alloc_path();

	if (!path)
@@ -1992,13 +1991,8 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
					   path, bytenr, num_bytes, parent,

					   root_objectid, owner, offset,

					   refs_to_add, extent_op);

	if (ret == 0)

		goto out;



	if (ret != -EAGAIN) {

		err = ret;

	if (ret != -EAGAIN)

		goto out;

	}



	leaf = path->nodes[0];

	item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item);
@@ -2021,7 +2015,7 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
		btrfs_abort_transaction(trans, root, ret);

out:

	btrfs_free_path(path);

	return err;

	return ret;

}



static int run_delayed_data_ref(struct btrfs_trans_handle *trans,