diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-02-12 16:25:05 -0500 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-02-13 19:32:58 -0500 |
| commit | 145b9006a0ae753582902170ec1da49f89501845 (patch) | |
| tree | 308ddcabcf6cb2527b16683f0a8c442f2b04e7cf /drivers/md/persistent-data | |
| parent | 802ea9d8645d33d24b7b4cd4537c14f3e698bde0 (diff) | |
| download | talos-op-linux-145b9006a0ae753582902170ec1da49f89501845.tar.gz talos-op-linux-145b9006a0ae753582902170ec1da49f89501845.zip | |
dm space map disk: fix sm_disk_count_is_more_than_one()
dm_tm_shadow_block() is the only caller of
dm_sm_count_is_more_than_one() which only ever operates on a metadata
space-map. So in practice, sm_disk_count_is_more_than_one() isn't
actually used (which explains why this bug never amounted to anything).
But fix sm_disk_count_is_more_than_one() to properly set *result and
return 0.
Reported-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/persistent-data')
| -rw-r--r-- | drivers/md/persistent-data/dm-space-map-disk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c index cfbf9617e465..ebb280a14325 100644 --- a/drivers/md/persistent-data/dm-space-map-disk.c +++ b/drivers/md/persistent-data/dm-space-map-disk.c @@ -78,7 +78,9 @@ static int sm_disk_count_is_more_than_one(struct dm_space_map *sm, dm_block_t b, if (r) return r; - return count > 1; + *result = count > 1; + + return 0; } static int sm_disk_set_count(struct dm_space_map *sm, dm_block_t b, |
