aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-01-06 12:19:22 -0800
committerDan Williams <dan.j.williams@intel.com>2016-01-09 08:39:04 -0800
commitd3b407fb3f782bd915db64e266010ea30a2d381e (patch)
tree2f6b62c418f28892adcdd6a52a2b874b64e34fa7
parentad9a8bde2cb19f6876f964fc48acc8b6a2f325ff (diff)
downloadlinux-yocto-d3b407fb3f782bd915db64e266010ea30a2d381e.tar.gz
linux-yocto-d3b407fb3f782bd915db64e266010ea30a2d381e.tar.bz2
linux-yocto-d3b407fb3f782bd915db64e266010ea30a2d381e.zip
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)
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 88579cf373b8..f463c67e6ba2 100644
--- 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 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)
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 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);
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