Unverified Commit ab3f2869 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11936 btrfs: remove NULL transaction support for btrfs_lookup_extent_info() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZJPBLLL6HZ72BWYHO6POEQAF5XPSI5BK/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARX0N 
 
Link:https://gitee.com/openeuler/kernel/pulls/11936

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 7de4430e 761926e6

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;