btrfs: make caching_thread use btrfs_find_next_key (6a9fb468) · Commits · 戴 / test

extent-tree.c has a find_next_key that just walks up the path to find the next key, but it is used for both the caching stuff and the snapshot delete stuff. The snapshot deletion stuff is special so it can't really use btrfs_find_next_key, but the caching thread stuff can. We just need to fix btrfs_find_next_key to deal with ->skip_locking and then it works exactly the same as the private find_next_key helper. Signed-off-by:

Josef Bacik <josef@toxicpanda.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/ctree.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5623,7 +5623,7 @@ int btrfs_find_next_key(struct btrfs_root root, struct btrfs_path path,
		int slot;
		struct extent_buffer *c;

		WARN_ON(!path->keep_locks);
		WARN_ON(!path->keep_locks && !path->skip_locking);
		while (level < BTRFS_MAX_LEVEL) {
		if (!path->nodes[level])
		return 1;
		@@ -5639,7 +5639,7 @@ next:
		!path->nodes[level + 1])
		return 1;

		if (path->locks[level + 1]) {
		if (path->locks[level + 1] \|\| path->skip_locking) {
		level++;
		continue;
		}

fs/btrfs/extent-tree.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -331,7 +331,7 @@ next:
		if (path->slots[0] < nritems) {
		btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
		} else {
		ret = find_next_key(path, 0, &key);
		ret = btrfs_find_next_key(extent_root, path, &key, 0, 0);
		if (ret)
		break;

Admin message