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

btrfs: rename __btrfs_map_block to btrfs_map_block 



Now that the old btrfs_map_block is gone, drop the leading underscores
from __btrfs_map_block.

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 d69d7ffc

fs/btrfs/bio.c

+2 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num) 
	int error;



	btrfs_bio_counter_inc_blocked(fs_info);

	error = __btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,

	error = btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,

				&bioc, &smap, &mirror_num, 1);

	if (error) {

		ret = errno_to_blk_status(error);

fs/btrfs/check-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ static int btrfsic_map_block(struct btrfsic_state *state, u64 bytenr, u32 len, 
	struct btrfs_device *device;



	length = len;

	ret = __btrfs_map_block(fs_info, BTRFS_MAP_READ, bytenr, &length, &bioc,

	ret = btrfs_map_block(fs_info, BTRFS_MAP_READ, bytenr, &length, &bioc,

			      NULL, &mirror_num, 0);

	if (ret) {

		block_ctx_out->start = 0;

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
 *   All new writes will be written to both target and source devices, so even

 *   if replace gets canceled, sources device still contains up-to-date data.

 *

 *   Location:		handle_ops_on_dev_replace() from __btrfs_map_block()

 *   Location:		handle_ops_on_dev_replace() from btrfs_map_block()

 *   Start:		btrfs_dev_replace_start()

 *   End:		btrfs_dev_replace_finishing()

 *   Content:		Latest data/metadata

fs/btrfs/volumes.c

+8 −8
Original line number Diff line number Diff line
@@ -6232,7 +6232,7 @@ static void set_io_stripe(struct btrfs_io_stripe *dst, const struct map_lookup * 
			stripe_offset + (stripe_nr << BTRFS_STRIPE_LEN_SHIFT);

}



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

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,

		    struct btrfs_io_stripe *smap, int *mirror_num_ret,
@@ -6486,7 +6486,7 @@ 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,

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

				 NULL, NULL, 1);

}
@@ -8066,7 +8066,7 @@ int btrfs_map_repair_block(struct btrfs_fs_info *fs_info, 


	ASSERT(mirror_num > 0);



	ret = __btrfs_map_block(fs_info, BTRFS_MAP_WRITE, logical, &map_length,

	ret = btrfs_map_block(fs_info, BTRFS_MAP_WRITE, logical, &map_length,

			      &bioc, smap, &mirror_ret, true);

	if (ret < 0)

		return ret;

fs/btrfs/volumes.h

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

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,

		    struct btrfs_io_stripe *smap, int *mirror_num_ret,