From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 20 May 2018 13:24:49 +0000 (+0200)
Subject: 4.16-stable patches
X-Git-Tag: v4.9.102~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e133185c0468bbcab1229bc5750844a45fd74521;p=thirdparty%2Fkernel%2Fstable-queue.git

4.16-stable patches

added patches:
	bcache-return-0-from-bch_debug_init-if-config_debug_fs-n.patch
---

diff --git a/queue-4.16/bcache-return-0-from-bch_debug_init-if-config_debug_fs-n.patch b/queue-4.16/bcache-return-0-from-bch_debug_init-if-config_debug_fs-n.patch
new file mode 100644
index 00000000000..984dff47229
--- /dev/null
+++ b/queue-4.16/bcache-return-0-from-bch_debug_init-if-config_debug_fs-n.patch
@@ -0,0 +1,51 @@
+From 1c1a2ee1b53b006754073eefc65d2b2cedb5264b Mon Sep 17 00:00:00 2001
+From: Coly Li <colyli@suse.de>
+Date: Thu, 17 May 2018 23:33:26 +0800
+Subject: bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n
+
+From: Coly Li <colyli@suse.de>
+
+commit 1c1a2ee1b53b006754073eefc65d2b2cedb5264b upstream.
+
+Commit 539d39eb2708 ("bcache: fix wrong return value in bch_debug_init()")
+returns the return value of debugfs_create_dir() to bcache_init(). When
+CONFIG_DEBUG_FS=n, bch_debug_init() always returns 1 and makes
+bcache_init() failedi.
+
+This patch makes bch_debug_init() always returns 0 if CONFIG_DEBUG_FS=n,
+so bcache can continue to work for the kernels which don't have debugfs
+enanbled.
+
+Changelog:
+v4: Add Acked-by from Kent Overstreet.
+v3: Use IS_ENABLED(CONFIG_DEBUG_FS) to replace #ifdef DEBUG_FS.
+v2: Remove a warning information
+v1: Initial version.
+
+Fixes: Commit 539d39eb2708 ("bcache: fix wrong return value in bch_debug_init()")
+Cc: stable@vger.kernel.org
+Signed-off-by: Coly Li <colyli@suse.de>
+Reported-by: Massimo B. <massimo.b@gmx.net>
+Reported-by: Kai Krakow <kai@kaishome.de>
+Tested-by: Kai Krakow <kai@kaishome.de>
+Acked-by: Kent Overstreet <kent.overstreet@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Kai Krakow <kai@kaishome.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/bcache/debug.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/md/bcache/debug.c
++++ b/drivers/md/bcache/debug.c
+@@ -251,6 +251,9 @@ void bch_debug_exit(void)
+ 
+ int __init bch_debug_init(struct kobject *kobj)
+ {
++	if (!IS_ENABLED(CONFIG_DEBUG_FS))
++		return 0;
++
+ 	debug = debugfs_create_dir("bcache", NULL);
+ 
+ 	return IS_ERR_OR_NULL(debug);
diff --git a/queue-4.16/series b/queue-4.16/series
index 7f59255dc46..83dc7c3706c 100644
--- a/queue-4.16/series
+++ b/queue-4.16/series
@@ -44,3 +44,4 @@ s390-cpum_sf-ensure-sample-frequency-of-perf-event-attributes-is-non-zero.patch
 s390-qdio-don-t-release-memory-in-qdio_setup_irq.patch
 s390-kernel-use-expoline-for-indirect-branches.patch
 s390-remove-indirect-branch-from-do_softirq_own_stack.patch
+bcache-return-0-from-bch_debug_init-if-config_debug_fs-n.patch