]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bcache: unregister reboot notifier if bcache fails to unregister device
authorZheng Liu <wenqing.lz@taobao.com>
Mon, 30 Nov 2015 01:21:57 +0000 (17:21 -0800)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 2 Feb 2016 19:09:10 +0000 (19:09 +0000)
commit 2ecf0cdb2b437402110ab57546e02abfa68a716b upstream.

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>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/md/bcache/super.c

index 4a535687991471146a1da764bfc144a406accf7e..04506f7189e711ae2b21df17cf1f85589b4875b2 100644 (file)
@@ -2087,8 +2087,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)) ||