[PATCH 3.2 043/152] dm space map metadata: fix sm_bootstrap_get_nr_blocks()
From: Ben Hutchings <hidden>
Date: 2015-02-17 02:18:29
Also in:
lkml
3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <redacted>
commit c1c6156fe4d4577444b769d7edd5dd503e57bbc9 upstream.
This function isn't right and it causes a static checker warning:
drivers/md/dm-thin.c:3016 maybe_resize_data_dev()
error: potentially using uninitialized 'sb_data_size'.
It should set "*count" and return zero on success the same as the
sm_metadata_get_nr_blocks() function does earlier.
Fixes: 3241b1d3e0aa ('dm: add persistent data library')
Signed-off-by: Dan Carpenter <redacted>
Acked-by: Joe Thornber <redacted>
Signed-off-by: Mike Snitzer <redacted>
Signed-off-by: Ben Hutchings <redacted>
---
drivers/md/persistent-data/dm-space-map-metadata.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/md/persistent-data/dm-space-map-metadata.c
+++ b/drivers/md/persistent-data/dm-space-map-metadata.c@@ -419,7 +419,9 @@ static int sm_bootstrap_get_nr_blocks(st { struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm); - return smm->ll.nr_blocks; + *count = smm->ll.nr_blocks; + + return 0; } static int sm_bootstrap_get_nr_free(struct dm_space_map *sm, dm_block_t *count)