Commit 1eb82ef8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

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: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 04f0847c

fs/btrfs/block-group.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/block-group.h

+1 −2
Original line number Diff line number Diff line
@@ -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)

{

fs/btrfs/tests/extent-map-tests.c

+1 −1
Original line number Diff line number Diff line
@@ -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",