aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-01-06 15:19:22 -0500
committerDan Williams <dan.j.williams@intel.com>2016-01-09 11:39:04 -0500
commitd3b407fb3f782bd915db64e266010ea30a2d381e (patch)
tree2f6b62c418f28892adcdd6a52a2b874b64e34fa7
parentad9a8bde2cb19f6876f964fc48acc8b6a2f325ff (diff)
badblocks: rename badblocks_free to badblocks_exit
For symmetry with badblocks_init() make it clear that this path only destroys incremental allocations of a badblocks instance, and does not free the badblocks instance itself. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--block/badblocks.c6
-rw-r--r--block/genhd.c2
-rw-r--r--drivers/md/md.c2
-rw-r--r--include/linux/badblocks.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/block/badblocks.c b/block/badblocks.c
index 96aeb9194a2e..fabf6b64c2d1 100644
--- a/block/badblocks.c
+++ b/block/badblocks.c
@@ -550,12 +550,12 @@ int badblocks_init(struct badblocks *bb, int enable)
550EXPORT_SYMBOL_GPL(badblocks_init); 550EXPORT_SYMBOL_GPL(badblocks_init);
551 551
552/** 552/**
553 * badblocks_free() - free the badblocks structure 553 * badblocks_exit() - free the badblocks structure
554 * @bb: the badblocks structure that holds all badblock information 554 * @bb: the badblocks structure that holds all badblock information
555 */ 555 */
556void badblocks_free(struct badblocks *bb) 556void badblocks_exit(struct badblocks *bb)
557{ 557{
558 kfree(bb->page); 558 kfree(bb->page);
559 bb->page = NULL; 559 bb->page = NULL;
560} 560}
561EXPORT_SYMBOL_GPL(badblocks_free); 561EXPORT_SYMBOL_GPL(badblocks_exit);
diff --git a/block/genhd.c b/block/genhd.c
index 88579cf373b8..f463c67e6ba2 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -671,7 +671,7 @@ void del_gendisk(struct gendisk *disk)
671 blk_unregister_region(disk_devt(disk), disk->minors); 671 blk_unregister_region(disk_devt(disk), disk->minors);
672 672
673 if (disk->bb) { 673 if (disk->bb) {
674 badblocks_free(disk->bb); 674 badblocks_exit(disk->bb);
675 kfree(disk->bb); 675 kfree(disk->bb);
676 } 676 }
677 677
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1e48aa9de352..96a991821ae6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -710,7 +710,7 @@ void md_rdev_clear(struct md_rdev *rdev)
710 put_page(rdev->bb_page); 710 put_page(rdev->bb_page);
711 rdev->bb_page = NULL; 711 rdev->bb_page = NULL;
712 } 712 }
713 badblocks_free(&rdev->badblocks); 713 badblocks_exit(&rdev->badblocks);
714} 714}
715EXPORT_SYMBOL_GPL(md_rdev_clear); 715EXPORT_SYMBOL_GPL(md_rdev_clear);
716 716
diff --git a/include/linux/badblocks.h b/include/linux/badblocks.h
index 929344630b51..2d98c026c57f 100644
--- a/include/linux/badblocks.h
+++ b/include/linux/badblocks.h
@@ -48,6 +48,6 @@ ssize_t badblocks_show(struct badblocks *bb, char *page, int unack);
48ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len, 48ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len,
49 int unack); 49 int unack);
50int badblocks_init(struct badblocks *bb, int enable); 50int badblocks_init(struct badblocks *bb, int enable);
51void badblocks_free(struct badblocks *bb); 51void badblocks_exit(struct badblocks *bb);
52 52
53#endif 53#endif