Commit 761926e6 authored by Filipe Manana's avatar Filipe Manana Committed by Yifan Qiao
Browse files

btrfs: remove NULL transaction support for btrfs_lookup_extent_info() 

mainline inclusion
from mainline-v6.11-rc1
commit 119474bdbac0858053cf367c8c932dd5c4bb4e85
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IARX0N

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=119474bdbac0858053cf367c8c932dd5c4bb4e85



--------------------------------

There are no callers of btrfs_lookup_extent_info() that pass a NULL value
for the transaction handle argument, so there's no point in having special
logic to deal with the NULL. The last caller that passed a NULL value was
removed in commit 19b546d7 ("btrfs: relocation:
Use btrfs_find_all_leafs to locate data extent parent tree leaves").

So remove the NULL handling from btrfs_lookup_extent_info().

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202409271612.ikY68CAg-lkp@intel.com/


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>
Signed-off-by: default avatarYifan Qiao <qiaoyifan4@huawei.com>
parent 77f73ef1

fs/btrfs/extent-tree.c

+2 −14
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, 
	if (!path)

		return -ENOMEM;



	if (!trans) {

		path->skip_locking = 1;

		path->search_commit_root = 1;

	}



search_again:

	key.objectid = bytenr;

	key.offset = offset;
@@ -164,11 +159,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, 
			btrfs_err(fs_info,

			"unexpected extent item size, has %u expect >= %zu",

				  item_size, sizeof(*ei));

			if (trans)

			btrfs_abort_transaction(trans, ret);

			else

				btrfs_handle_fs_error(fs_info, ret, NULL);



			goto out_free;

		}
@@ -189,9 +180,6 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, 
		ret = 0;

	}



	if (!trans)

		goto out;



	delayed_refs = &trans->transaction->delayed_refs;

	spin_lock(&delayed_refs->lock);

	head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
@@ -231,7 +219,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, 
		mutex_unlock(&head->mutex);

	}

	spin_unlock(&delayed_refs->lock);

out:



	WARN_ON(num_refs == 0);

	if (refs)

		*refs = num_refs;