diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-06-27 08:13:23 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2023-07-11 17:32:14 +0200 |
| commit | 4e7de35eb7d1a1d4f2dda15f39fbedd4798a0b8d (patch) | |
| tree | 90b5b60c7393edb761abaf278129b83373176252 | |
| parent | b19c98f237cd76981aaded52c258ce93f7daa8cb (diff) | |
| download | linux-4e7de35eb7d1a1d4f2dda15f39fbedd4798a0b8d.tar.gz linux-4e7de35eb7d1a1d4f2dda15f39fbedd4798a0b8d.tar.bz2 linux-4e7de35eb7d1a1d4f2dda15f39fbedd4798a0b8d.zip | |
btrfs: be a bit more careful when setting mirror_num_ret in btrfs_map_block
The mirror_num_ret is allowed to be NULL, although it has to be set when
smap is set. Unfortunately that is not a well enough specifiable
invariant for static type checkers, so add a NULL check to make sure they
are fine.
Fixes: 03793cbbc80f ("btrfs: add fast path for single device io in __btrfs_map_block")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
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>
| -rw-r--r-- | fs/btrfs/volumes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 30b8744a7591..efa19a528c33 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6398,7 +6398,8 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, (op == BTRFS_MAP_READ || !dev_replace_is_ongoing || !dev_replace->tgtdev)) { set_io_stripe(smap, map, stripe_index, stripe_offset, stripe_nr); - *mirror_num_ret = mirror_num; + if (mirror_num_ret) + *mirror_num_ret = mirror_num; *bioc_ret = NULL; ret = 0; goto out; |