The commit is pushed to "branch-rh7-3.10.0-1127.18.2.vz7.163.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1127.18.2.vz7.163.21
------>
commit 35f7558038e1a4c78638042f332029360e4f3493
Author: Zheng Liu <wenqing...@taobao.com>
Date: Tue Sep 15 11:55:11 2020 +0300
ms/bcache: unregister reboot notifier if bcache fails to unregister device
#PSBM-106785
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...@taobao.com>
Tested-by: Joshua Schmid <jsch...@suse.com>
Tested-by: Eric Wheeler <bca...@linux.ewheeler.net>
Cc: Kent Overstreet <k...@daterainc.com>
Cc: sta...@vger.kernel.org
Signed-off-by: Jens Axboe <ax...@fb.com>
https://jira.sw.ru/browse/PSBM-106785
(cherry picked from commit 2ecf0cdb2b437402110ab57546e02abfa68a716b)
Signed-off-by: Andrey Ryabinin <aryabi...@virtuozzo.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 0fccdc3..88a0085 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1959,8 +1959,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)) ||
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
