From 8557c7f2010cfd73245b863e178b95c5728779fe Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Feb 2016 21:38:54 -0800 Subject: [PATCH] 3.10-stable patches added patches: bcache-unregister-reboot-notifier-if-bcache-fails-to-unregister-device.patch --- ...if-bcache-fails-to-unregister-device.patch | 37 +++++++++++++++++++ queue-3.10/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-3.10/bcache-unregister-reboot-notifier-if-bcache-fails-to-unregister-device.patch diff --git a/queue-3.10/bcache-unregister-reboot-notifier-if-bcache-fails-to-unregister-device.patch b/queue-3.10/bcache-unregister-reboot-notifier-if-bcache-fails-to-unregister-device.patch new file mode 100644 index 00000000000..c34c6cfcbfd --- /dev/null +++ b/queue-3.10/bcache-unregister-reboot-notifier-if-bcache-fails-to-unregister-device.patch @@ -0,0 +1,37 @@ +From 2ecf0cdb2b437402110ab57546e02abfa68a716b Mon Sep 17 00:00:00 2001 +From: Zheng Liu +Date: Sun, 29 Nov 2015 17:21:57 -0800 +Subject: bcache: unregister reboot notifier if bcache fails to unregister device + +From: Zheng Liu + +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 +Tested-by: Joshua Schmid +Tested-by: Eric Wheeler +Cc: Kent Overstreet +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/bcache/super.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- 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)) || diff --git a/queue-3.10/series b/queue-3.10/series index 6b7ed17df62..a8765476e57 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,3 +1,4 @@ tracepoints-do-not-trace-when-cpu-is-offline.patch drm-ast-initialized-data-needed-to-map-fbdev-memory.patch netfilter-nf_conntrack-fix-rcu-race-in-nf_conntrack_find_get.patch +bcache-unregister-reboot-notifier-if-bcache-fails-to-unregister-device.patch -- 2.47.3