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>

diff --git a/block/badblocks.c b/block/badblocks.c
index 96aeb9194a2ef0d72c149b54d834bb810126779e..fabf6b64c2d17692b511336de3e113c18c3e95e6 100644 (file)
--- a/block/badblocks.c
+++ b/block/badblocks.c
@@ -550,12 +550,12 @@ int badblocks_init(struct badblocks *bb, int enable)
 EXPORT_SYMBOL_GPL(badblocks_init);
 
 /**
- * badblocks_free() - free the badblocks structure
+ * badblocks_exit() - free the badblocks structure
  * @bb:                the badblocks structure that holds all badblock information
  */
-void badblocks_free(struct badblocks *bb)
+void badblocks_exit(struct badblocks *bb)
 {
        kfree(bb->page);
        bb->page = NULL;
 }
-EXPORT_SYMBOL_GPL(badblocks_free);
+EXPORT_SYMBOL_GPL(badblocks_exit);

diff --git a/block/genhd.c b/block/genhd.c
index 88579cf373b8b13270359d949b59c0d66937a5aa..f463c67e6ba2611e896382ba9485aa00b4644b23 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -671,7 +671,7 @@ void del_gendisk(struct gendisk *disk)
        blk_unregister_region(disk_devt(disk), disk->minors);
 
        if (disk->bb) {
-               badblocks_free(disk->bb);
+               badblocks_exit(disk->bb);
                kfree(disk->bb);
        }
 

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1e48aa9de352f7ba664c963b9e51843789da0e42..96a991821ae66918e0db559f4c6a5b364f0779d6 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -710,7 +710,7 @@ void md_rdev_clear(struct md_rdev *rdev)
                put_page(rdev->bb_page);
                rdev->bb_page = NULL;
        }
-       badblocks_free(&rdev->badblocks);
+       badblocks_exit(&rdev->badblocks);
 }
 EXPORT_SYMBOL_GPL(md_rdev_clear);
 

diff --git a/include/linux/badblocks.h b/include/linux/badblocks.h
index 929344630b51c2b10e7240410ca95ad9c01f9960..2d98c026c57f66d14b0a2364b23e6a3d0d04ddf3 100644 (file)
--- 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);
 ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len,
                        int unack);
 int badblocks_init(struct badblocks *bb, int enable);
-void badblocks_free(struct badblocks *bb);
+void badblocks_exit(struct badblocks *bb);
 
 #endif