Commit 631003e2 authored Apr 18, 2023 by Naohiro Aota Committed by David Sterba Apr 28, 2023

btrfs: zoned: fix wrong use of bitops API in btrfs_ensure_empty_zones



find_next_bit and find_next_zero_bit take @size as the second parameter and
@offset as the third parameter. They are specified opposite in
btrfs_ensure_empty_zones(). Thanks to the later loop, it never failed to
detect the empty zones. Fix them and (maybe) return the result a bit
faster.

Note: the naming is a bit confusing, size has two meanings here, bitmap
and our range size.

Fixes: 1cd6121f ("btrfs: zoned: implement zoned chunk allocator")
CC: stable@vger.kernel.org # 5.15+
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 64b5d5b2

fs/btrfs/zoned.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1168,12 +1168,12 @@ int btrfs_ensure_empty_zones(struct btrfs_device *device, u64 start, u64 size)
		return -ERANGE;

		/* All the zones are conventional */
		if (find_next_bit(zinfo->seq_zones, begin, end) == end)
		if (find_next_bit(zinfo->seq_zones, end, begin) == end)
		return 0;

		/* All the zones are sequential and empty */
		if (find_next_zero_bit(zinfo->seq_zones, begin, end) == end &&
		find_next_zero_bit(zinfo->empty_zones, begin, end) == end)
		if (find_next_zero_bit(zinfo->seq_zones, end, begin) == end &&
		find_next_zero_bit(zinfo->empty_zones, end, begin) == end)
		return 0;

		for (pos = start; pos < start + size; pos += zinfo->zone_size) {