diff options
| author | David Sterba <dsterba@suse.com> | 2018-08-03 00:36:29 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-03-23 17:01:44 +0100 |
| commit | 75fb2e9e49c1bff94cf6652c40889690575ece7c (patch) | |
| tree | 008808e82dc2b5b39b3d1d16da7087d052b915eb | |
| parent | ee787f9550534612a4694cc4ec9f2d397d4b5752 (diff) | |
| download | linux-stable-75fb2e9e49c1bff94cf6652c40889690575ece7c.tar.gz linux-stable-75fb2e9e49c1bff94cf6652c40889690575ece7c.tar.bz2 linux-stable-75fb2e9e49c1bff94cf6652c40889690575ece7c.zip | |
btrfs: move mapping of block for discard to its caller
There's a simple forwarded call based on the operation that would better
fit the caller btrfs_map_block that's until now a trivial wrapper.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/volumes.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b9787945fe26..c93cafe83280 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5878,10 +5878,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, struct btrfs_io_geometry geom; ASSERT(bbio_ret); - - if (op == BTRFS_MAP_DISCARD) - return __btrfs_map_block_for_discard(fs_info, logical, - length, bbio_ret); + ASSERT(op != BTRFS_MAP_DISCARD); ret = btrfs_get_io_geometry(fs_info, op, logical, *length, &geom); if (ret < 0) @@ -6111,6 +6108,10 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, u64 logical, u64 *length, struct btrfs_bio **bbio_ret, int mirror_num) { + if (op == BTRFS_MAP_DISCARD) + return __btrfs_map_block_for_discard(fs_info, logical, + length, bbio_ret); + return __btrfs_map_block(fs_info, op, logical, length, bbio_ret, mirror_num, 0); } |