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

Commit 380fd066 authored by Misono Tomohiro's avatar Misono Tomohiro Committed by David Sterba
Browse files

btrfs: remove redundant variable from btrfs_cross_ref_exist 



Since commit d7df2c79 ("Btrfs attach delayed ref updates to delayed
ref heads"), check_delayed_ref() won't return -ENOENT.

In btrfs_cross_ref_exist(), two variables 'ret' and 'ret2' are
originally used to handle -ENOENT error case.  Since the code is not
needed anymore, let's just remove 'ret2'.

Signed-off-by: default avatarMisono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e49aabd9

fs/btrfs/extent-tree.c

+2 −11
Original line number Diff line number Diff line
@@ -3139,7 +3139,6 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset, 
{

	struct btrfs_path *path;

	int ret;

	int ret2;



	path = btrfs_alloc_path();

	if (!path)
@@ -3151,17 +3150,9 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset, 
		if (ret && ret != -ENOENT)

			goto out;



		ret2 = check_delayed_ref(root, path, objectid,

					 offset, bytenr);

	} while (ret2 == -EAGAIN);

		ret = check_delayed_ref(root, path, objectid, offset, bytenr);

	} while (ret == -EAGAIN);



	if (ret2 && ret2 != -ENOENT) {

		ret = ret2;

		goto out;

	}



	if (ret != -ENOENT || ret2 != -ENOENT)

		ret = 0;

out:

	btrfs_free_path(path);

	if (root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID)