From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 17 Apr 2016 04:23:48 +0000 (-0400)
Subject: Fix build failure if --config-jbd-debug isn't enabled
X-Git-Tag: v1.43-WIP-2016-05-12~25
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=f08999053e512771ad20650886b2abb637a02a45;p=tools%2Fe2fsprogs.git

Fix build failure if --config-jbd-debug isn't enabled

This fixes a bug that was introduced recently in commit 1fc23b5e77.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/lib/ext2fs/kernel-jbd.h b/lib/ext2fs/kernel-jbd.h
index c1fec3f..092a50b 100644
--- a/lib/ext2fs/kernel-jbd.h
+++ b/lib/ext2fs/kernel-jbd.h
@@ -46,7 +46,7 @@ extern int journal_enable_debug;
 	} while (0)
 #else
 #ifdef __GNUC__
-#ifdef __KERNEL__
+#if defined(__KERNEL__) || !defined(CONFIG_JBD_DEBUG)
 #define jbd_debug(f, a...)	/**/
 #else
 extern int journal_enable_debug;