libnvdimm, label: Switch to bitmap_zalloc()
PATCH 1/1 libnvdimm, label: Switch to bitmap_zalloc()
Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/nvdimm/label.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/nvdimm/label.c +3 -4
@@ -814,8 +814,7 @@ static int __blk_label_update(struct nd_region *nd_region, victims =0 ;if (old_num_resources) {/* convert old local-label-map to dimm-slot victim-map */ - victim_map =kcalloc (BITS_TO_LONGS (nslot),sizeof (long ), -GFP_KERNEL ); + victim_map =bitmap_zalloc (nslot,GFP_KERNEL );if (!victim_map)return -ENOMEM ;
@@ -838,7 +837,7 @@ static int __blk_label_update(struct nd_region *nd_region,/* don't allow updates that consume the last label */ if (nfree - alloc <0 || nfree - alloc + victims <1 ) {dev_info (&nsblk->common.dev,"insufficient label space\n" ); -kfree (victim_map); +bitmap_free (victim_map);return -ENOSPC ; }/* from here on we need to abort on error */
@@ -1010,7 +1009,7 @@ static int __blk_label_update(struct nd_region *nd_region, out:kfree (old_res_list); -kfree (victim_map); +bitmap_free (victim_map);return rc; abort:
Signature · 6 lines
2.18.0 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Looks good,
Reviewed-by Johannes Thumshirn <[email protected]>
Signature · 10 lines
Johannes Thumshirn Storage [email protected] +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 4 lines · Andy Shevchenko
Switch to
bitmap_zalloc()to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.Signed-off-by Andy Shevchenko <[email protected]>
Applied
Quoted 29 lines
--- drivers/nvdimm/label.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/nvdimm/label.c +2
-3@@ -814,8 +814,7 @@ static int __blk_label_update(struct nd_region *nd_region, victims =0 ;if (old_num_resources) {/* convert old local-label-map to dimm-slot victim-map */ - victim_map =kcalloc (BITS_TO_LONGS (nslot),sizeof (long ), -GFP_KERNEL ); + victim_map =bitmap_zalloc (nslot,GFP_KERNEL );if (!victim_map)return -ENOMEM ;@@ -838,7 +837,7 @@ static int __blk_label_update(struct nd_region *nd_region,/* don't allow updates that consume the last label */ if (nfree - alloc <0 || nfree - alloc + victims <1 ) {dev_info (&nsblk->common.dev,"insufficient label space\n" ); -kfree (victim_map); +bitmap_free (victim_map);return -ENOSPC ; }/* from here on we need to abort on error */
drivers/nvdimm/label.c static int __blk_label_update(struct nd_region *nd_region, · line 1015
Quoted 8 lines
drivers/nvdimm/label.c +1
-1@@ -1010,7 +1009,7 @@ static int __blk_label_update(struct nd_region *nd_region, out:kfree (old_res_list); -kfree (victim_map); +bitmap_free (victim_map);return rc; abort:
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm