36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From: Zheng Liu <wenqing.lz@taobao.com>
|
|
Date: Sun, 29 Nov 2015 17:21:57 -0800
|
|
Subject: [5/8] bcache: unregister reboot notifier if bcache fails to
|
|
unregister device
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=2ecf0cdb2b437402110ab57546e02abfa68a716b
|
|
|
|
In bcache_init() function it forgot to unregister reboot notifier if
|
|
bcache fails to unregister a block device. This commit fixes this.
|
|
|
|
Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
|
|
Tested-by: Joshua Schmid <jschmid@suse.com>
|
|
Tested-by: Eric Wheeler <bcache@linux.ewheeler.net>
|
|
Cc: Kent Overstreet <kmo@daterainc.com>
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Jens Axboe <axboe@fb.com>
|
|
---
|
|
drivers/md/bcache/super.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
|
|
index 43e911e..18f14a2 100644
|
|
--- a/drivers/md/bcache/super.c
|
|
+++ b/drivers/md/bcache/super.c
|
|
@@ -2071,8 +2071,10 @@ static int __init bcache_init(void)
|
|
closure_debug_init();
|
|
|
|
bcache_major = register_blkdev(0, "bcache");
|
|
- if (bcache_major < 0)
|
|
+ if (bcache_major < 0) {
|
|
+ unregister_reboot_notifier(&reboot);
|
|
return bcache_major;
|
|
+ }
|
|
|
|
if (!(bcache_wq = create_workqueue("bcache")) ||
|
|
!(bcache_kobj = kobject_create_and_add("bcache", fs_kobj)) ||
|