Commit 1fdbd03d authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: simplify error handling at btrfs_del_root_ref() 



At btrfs_del_root_ref() we are using two return variables, named 'ret'
and 'err'. This makes it harder to follow and easier to return the wrong
value in case an error happens - the previous patch in the series, which
has the subject "btrfs: fix silent failure when deleting root
reference", fixed a bug due to confusion created by these two variables.

So change the function to use a single variable for tracking the return
value of the function, using only 'ret', which is consistent with most
of the codebase.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 48ff7083

fs/btrfs/root-tree.c

+7 −9
Original line number Diff line number Diff line
@@ -337,7 +337,6 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
	struct extent_buffer *leaf;

	struct btrfs_key key;

	unsigned long ptr;

	int err = 0;

	int ret;



	path = btrfs_alloc_path();
@@ -350,7 +349,6 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
again:

	ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1);

	if (ret < 0) {

		err = ret;

		goto out;

	} else if (ret == 0) {

		leaf = path->nodes[0];
@@ -360,18 +358,18 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
		if ((btrfs_root_ref_dirid(leaf, ref) != dirid) ||

		    (btrfs_root_ref_name_len(leaf, ref) != name_len) ||

		    memcmp_extent_buffer(leaf, name, ptr, name_len)) {

			err = -ENOENT;

			ret = -ENOENT;

			goto out;

		}

		*sequence = btrfs_root_ref_sequence(leaf, ref);



		ret = btrfs_del_item(trans, tree_root, path);

		if (ret) {

			err = ret;

		if (ret)

			goto out;

	} else {

		ret = -ENOENT;

		goto out;

	}

	} else

		err = -ENOENT;



	if (key.type == BTRFS_ROOT_BACKREF_KEY) {

		btrfs_release_path(path);
@@ -383,7 +381,7 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 


out:

	btrfs_free_path(path);

	return err;

	return ret;

}



/*