iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: rename __btrfs_map_block to btrfs_map_block

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

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Christoph Hellwig 2023-05-31 06:17:37 +02:00 committed by David Sterba
parent d69d7ffc26
commit cd4efd210e
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/bio.c
View File

@ -623,8 +623,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
int error; int error;
btrfs_bio_counter_inc_blocked(fs_info); 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); &bioc, &smap, &mirror_num, 1);
if (error) { if (error) {
ret = errno_to_blk_status(error); ret = errno_to_blk_status(error);
goto fail; goto fail;

4
fs/btrfs/check-integrity.c
View File

@ -1464,8 +1464,8 @@ static int btrfsic_map_block(struct btrfsic_state *state, u64 bytenr, u32 len,
struct btrfs_device *device; struct btrfs_device *device;
length = len; 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); NULL, &mirror_num, 0);
if (ret) { if (ret) {
block_ctx_out->start = 0; block_ctx_out->start = 0;
block_ctx_out->dev_bytenr = 0; block_ctx_out->dev_bytenr = 0;

2
fs/btrfs/dev-replace.c
View File

@ -41,7 +41,7 @@
* All new writes will be written to both target and source devices, so even * 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. * 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() * Start: btrfs_dev_replace_start()
* End: btrfs_dev_replace_finishing() * End: btrfs_dev_replace_finishing()
* Content: Latest data/metadata * Content: Latest data/metadata

16
fs/btrfs/volumes.c
View File

@ -6232,11 +6232,11 @@ static void set_io_stripe(struct btrfs_io_stripe *dst, const struct map_lookup *
stripe_offset + (stripe_nr << BTRFS_STRIPE_LEN_SHIFT); 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, u64 logical, u64 *length,
struct btrfs_io_context **bioc_ret, struct btrfs_io_context **bioc_ret,
struct btrfs_io_stripe *smap, int *mirror_num_ret, struct btrfs_io_stripe *smap, int *mirror_num_ret,
int need_raid_map) int need_raid_map)
{ {
struct extent_map *em; struct extent_map *em;
struct map_lookup *map; struct map_lookup *map;
@ -6486,7 +6486,7 @@ int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
u64 logical, u64 *length, u64 logical, u64 *length,
struct btrfs_io_context **bioc_ret) 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); NULL, NULL, 1);
} }
@ -8066,8 +8066,8 @@ int btrfs_map_repair_block(struct btrfs_fs_info *fs_info,
ASSERT(mirror_num > 0); 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); &bioc, smap, &mirror_ret, true);
if (ret < 0) if (ret < 0)
return ret; return ret;

10
fs/btrfs/volumes.h
View File

@ -585,11 +585,11 @@ void btrfs_put_bioc(struct btrfs_io_context *bioc);
int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
u64 logical, u64 *length, u64 logical, u64 *length,
struct btrfs_io_context **bioc_ret); 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, u64 logical, u64 *length,
struct btrfs_io_context **bioc_ret, struct btrfs_io_context **bioc_ret,
struct btrfs_io_stripe *smap, int *mirror_num_ret, struct btrfs_io_stripe *smap, int *mirror_num_ret,
int need_raid_map); int need_raid_map);
int btrfs_map_repair_block(struct btrfs_fs_info *fs_info, int btrfs_map_repair_block(struct btrfs_fs_info *fs_info,
struct btrfs_io_stripe *smap, u64 logical, struct btrfs_io_stripe *smap, u64 logical,
u32 length, int mirror_num); u32 length, int mirror_num);