btrfs: export bitmap_test_range_all_{set,zero}

bitmap_test_range_all_{set,zero} defined in subpage.c are useful for other
components. Move them to misc.h and use them in zoned.c. Also, as
find_next{,_zero}_bit take/return "unsigned long" instead of "unsigned
int", convert the type to "unsigned long".

While at it, also rewrite the "if (...) return true; else return false;"
pattern and add const to the input bitmap.

Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/misc.h b/fs/btrfs/misc.h
index 768583a440e11db8c6a1fcfb567e81168771f107..005751a1291101a1ea7f19d3d9419da6516dd418 100644 (file)
--- a/fs/btrfs/misc.h
+++ b/fs/btrfs/misc.h
@@ -143,4 +143,24 @@ static inline struct rb_node *rb_simple_insert(struct rb_root *root, u64 bytenr,
        return NULL;
 }
 
+static inline bool bitmap_test_range_all_set(const unsigned long *addr,
+                                            unsigned long start,
+                                            unsigned long nbits)
+{
+       unsigned long found_zero;
+
+       found_zero = find_next_zero_bit(addr, start + nbits, start);
+       return (found_zero == start + nbits);
+}
+
+static inline bool bitmap_test_range_all_zero(const unsigned long *addr,
+                                             unsigned long start,
+                                             unsigned long nbits)
+{
+       unsigned long found_set;
+
+       found_set = find_next_bit(addr, start + nbits, start);
+       return (found_set == start + nbits);
+}
+
 #endif

diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c
index dd46b978ac2cfcb5b713e589115cd8798f783934..045117ca0ddc43e29e034ccf1f0cfcf8d99abf58 100644 (file)
--- a/fs/btrfs/subpage.c
+++ b/fs/btrfs/subpage.c
@@ -367,28 +367,6 @@ void btrfs_page_end_writer_lock(const struct btrfs_fs_info *fs_info,
                unlock_page(page);
 }
 
-static bool bitmap_test_range_all_set(unsigned long *addr, unsigned int start,
-                                     unsigned int nbits)
-{
-       unsigned int found_zero;
-
-       found_zero = find_next_zero_bit(addr, start + nbits, start);
-       if (found_zero == start + nbits)
-               return true;
-       return false;
-}
-
-static bool bitmap_test_range_all_zero(unsigned long *addr, unsigned int start,
-                                      unsigned int nbits)
-{
-       unsigned int found_set;
-
-       found_set = find_next_bit(addr, start + nbits, start);
-       if (found_set == start + nbits)
-               return true;
-       return false;
-}
-
 #define subpage_calc_start_bit(fs_info, page, name, start, len)                \
 ({                                                                     \
        unsigned int start_bit;                                         \

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 39828af4a4e8ccc49611635688c9d8674ab430b1..dac879fe28710bf6402f4e72d6f3ef14c2a8bca0 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1057,7 +1057,7 @@ u64 btrfs_find_allocatable_zones(struct btrfs_device *device, u64 hole_start,
 
                /* Check if zones in the region are all empty */
                if (btrfs_dev_is_sequential(device, pos) &&
-                   find_next_zero_bit(zinfo->empty_zones, end, begin) != end) {
+                   !bitmap_test_range_all_set(zinfo->empty_zones, begin, nzones)) {
                        pos += zinfo->zone_size;
                        continue;
                }
@@ -1156,23 +1156,23 @@ int btrfs_ensure_empty_zones(struct btrfs_device *device, u64 start, u64 size)
        struct btrfs_zoned_device_info *zinfo = device->zone_info;
        const u8 shift = zinfo->zone_size_shift;
        unsigned long begin = start >> shift;
-       unsigned long end = (start + size) >> shift;
+       unsigned long nbits = size >> shift;
        u64 pos;
        int ret;
 
        ASSERT(IS_ALIGNED(start, zinfo->zone_size));
        ASSERT(IS_ALIGNED(size, zinfo->zone_size));
 
-       if (end > zinfo->nr_zones)
+       if (begin + nbits > zinfo->nr_zones)
                return -ERANGE;
 
        /* All the zones are conventional */
-       if (find_next_bit(zinfo->seq_zones, end, begin) == end)
+       if (bitmap_test_range_all_zero(zinfo->seq_zones, begin, nbits))
                return 0;
 
        /* All the zones are sequential and empty */
-       if (find_next_zero_bit(zinfo->seq_zones, end, begin) == end &&
-           find_next_zero_bit(zinfo->empty_zones, end, begin) == end)
+       if (bitmap_test_range_all_set(zinfo->seq_zones, begin, nbits) &&
+           bitmap_test_range_all_set(zinfo->empty_zones, begin, nbits))
                return 0;
 
        for (pos = start; pos < start + size; pos += zinfo->zone_size) {