diff options
-rw-r--r-- | block/badblocks.c | 6 | ||||
-rw-r--r-- | block/genhd.c | 2 | ||||
-rw-r--r-- | drivers/md/md.c | 2 | ||||
-rw-r--r-- | include/linux/badblocks.h | 2 |
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) | |||
550 | EXPORT_SYMBOL_GPL(badblocks_init); | 550 | EXPORT_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 | */ |
556 | void badblocks_free(struct badblocks *bb) | 556 | void 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 | } |
561 | EXPORT_SYMBOL_GPL(badblocks_free); | 561 | 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) | |||
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 | } |
715 | EXPORT_SYMBOL_GPL(md_rdev_clear); | 715 | EXPORT_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); | |||
48 | ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len, | 48 | ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len, |
49 | int unack); | 49 | int unack); |
50 | int badblocks_init(struct badblocks *bb, int enable); | 50 | int badblocks_init(struct badblocks *bb, int enable); |
51 | void badblocks_free(struct badblocks *bb); | 51 | void badblocks_exit(struct badblocks *bb); |
52 | 52 | ||
53 | #endif | 53 | #endif |