btrfs: remove the bdev argument to btrfs_rmap_block

The only user in the zoned remap code is gone now, so remove the argument.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 45ccb25..5b10401 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -1965,7 +1965,6 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
  *
  * @fs_info:       the filesystem
  * @chunk_start:   logical address of block group
- * @bdev:         physical device to resolve, can be NULL to indicate any device
  * @physical:     physical address to map to logical addresses
  * @logical:      return array of logical addresses which map to @physical
  * @naddrs:       length of @logical
@@ -1976,8 +1975,7 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
  * block copies.
  */
 int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
-                    struct block_device *bdev, u64 physical, u64 **logical,
-                    int *naddrs, int *stripe_len)
+                    u64 physical, u64 **logical, int *naddrs, int *stripe_len)
 {
        struct extent_map *em;
        struct map_lookup *map;
@@ -2017,9 +2015,6 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
                              data_stripe_length))
                        continue;
 
-               if (bdev && map->stripes[i].dev->bdev != bdev)
-                       continue;
-
                stripe_nr = physical - map->stripes[i].physical;
                stripe_nr = div64_u64_rem(stripe_nr, map->stripe_len, &offset);
 
@@ -2076,7 +2071,7 @@ static int exclude_super_stripes(struct btrfs_block_group *cache)
 
        for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
                bytenr = btrfs_sb_offset(i);
-               ret = btrfs_rmap_block(fs_info, cache->start, NULL,
+               ret = btrfs_rmap_block(fs_info, cache->start,
                                       bytenr, &logical, &nr, &stripe_len);
                if (ret)
                        return ret;

diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
index 4fdc39f..6e4a0b4 100644 (file)
--- a/fs/btrfs/block-group.h
+++ b/fs/btrfs/block-group.h
@@ -328,8 +328,7 @@ u64 btrfs_get_alloc_profile(struct btrfs_fs_info *fs_info, u64 orig_flags);
 void btrfs_put_block_group_cache(struct btrfs_fs_info *info);
 int btrfs_free_block_groups(struct btrfs_fs_info *info);
 int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
-                      struct block_device *bdev, u64 physical, u64 **logical,
-                      int *naddrs, int *stripe_len);
+                    u64 physical, u64 **logical, int *naddrs, int *stripe_len);
 
 static inline u64 btrfs_data_alloc_profile(struct btrfs_fs_info *fs_info)
 {

diff --git a/fs/btrfs/tests/extent-map-tests.c b/fs/btrfs/tests/extent-map-tests.c
index c5b3a63..f2f2e11 100644 (file)
--- a/fs/btrfs/tests/extent-map-tests.c
+++ b/fs/btrfs/tests/extent-map-tests.c
@@ -509,7 +509,7 @@ static int test_rmap_block(struct btrfs_fs_info *fs_info,
                goto out_free;
        }
 
-       ret = btrfs_rmap_block(fs_info, em->start, NULL, btrfs_sb_offset(1),
+       ret = btrfs_rmap_block(fs_info, em->start, btrfs_sb_offset(1),
                               &logical, &out_ndaddrs, &out_stripe_len);
        if (ret || (out_ndaddrs == 0 && test->expected_mapped_addr)) {
                test_err("didn't rmap anything but expected %d",