diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-01-06 21:19:22 +0100 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-01-09 17:39:04 +0100 |
commit | d3b407fb3f782bd915db64e266010ea30a2d381e (patch) | |
tree | 2f6b62c418f28892adcdd6a52a2b874b64e34fa7 /block | |
parent | libnvdimm, pmem: move definition of nvdimm_namespace_add_poison to nd.h (diff) | |
download | linux-d3b407fb3f782bd915db64e266010ea30a2d381e.tar.xz linux-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>
Diffstat (limited to 'block')
-rw-r--r-- | block/badblocks.c | 6 | ||||
-rw-r--r-- | block/genhd.c | 2 |
2 files changed, 4 insertions, 4 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); } |