Commit 723b8bb1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: open code btrfs_map_sblock 



btrfs_map_sblock just hard codes three arguments and calls
btrfs_map_sblock.  Remove it as it doesn't provide any real value, but
makes following the btrfs_map_block call chains harder.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.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 cd4efd21

fs/btrfs/scrub.c

+5 −4
Original line number Diff line number Diff line
@@ -888,8 +888,9 @@ static void scrub_stripe_report_errors(struct scrub_ctx *sctx, 


		/* For scrub, our mirror_num should always start at 1. */

		ASSERT(stripe->mirror_num >= 1);

		ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS,

				       stripe->logical, &mapped_len, &bioc);

		ret = btrfs_map_block(fs_info, BTRFS_MAP_GET_READ_MIRRORS,

				      stripe->logical, &mapped_len, &bioc,

				      NULL, NULL, 1);

		/*

		 * If we failed, dev will be NULL, and later detailed reports

		 * will just be skipped.
@@ -1921,8 +1922,8 @@ static int scrub_raid56_parity_stripe(struct scrub_ctx *sctx, 
	bio->bi_end_io = raid56_scrub_wait_endio;



	btrfs_bio_counter_inc_blocked(fs_info);

	ret = btrfs_map_sblock(fs_info, BTRFS_MAP_WRITE, full_stripe_start,

			       &length, &bioc);

	ret = btrfs_map_block(fs_info, BTRFS_MAP_WRITE, full_stripe_start,

			      &length, &bioc, NULL, NULL, 1);

	if (ret < 0) {

		btrfs_put_bioc(bioc);

		btrfs_bio_counter_dec(fs_info);

fs/btrfs/volumes.c

+0 −9
Original line number Diff line number Diff line
@@ -6481,15 +6481,6 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
	return ret;

}



/* For Scrub/replace */

int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,

		     u64 logical, u64 *length,

		     struct btrfs_io_context **bioc_ret)

{

	return btrfs_map_block(fs_info, op, logical, length, bioc_ret,

				 NULL, NULL, 1);

}



static bool dev_args_match_fs_devices(const struct btrfs_dev_lookup_args *args,

				      const struct btrfs_fs_devices *fs_devices)

{

fs/btrfs/volumes.h

+0 −3
Original line number Diff line number Diff line
@@ -582,9 +582,6 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes) 


void btrfs_get_bioc(struct btrfs_io_context *bioc);

void btrfs_put_bioc(struct btrfs_io_context *bioc);

int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,

		     u64 logical, u64 *length,

		     struct btrfs_io_context **bioc_ret);

int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,

		    u64 logical, u64 *length,

		    struct btrfs_io_context **bioc_ret,

fs/btrfs/zoned.c

+2 −2
Original line number Diff line number Diff line
@@ -1799,8 +1799,8 @@ static int read_zone_info(struct btrfs_fs_info *fs_info, u64 logical, 
	int nmirrors;

	int i, ret;



	ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,

			       &mapped_length, &bioc);

	ret = btrfs_map_block(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,

			      &mapped_length, &bioc, NULL, NULL, 1);

	if (ret || !bioc || mapped_length < PAGE_SIZE) {

		ret = -EIO;

		goto out_put_bioc;