From b26f9035ed3112ccd4dea2d2365e70ef56a433fd Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 5 Dec 2012 12:42:58 -0800 Subject: [PATCH] --- yaml --- r: 339477 b: refs/heads/master c: 471b1f98719a8e8f34f3a696d488e50754f8cf73 h: refs/heads/master i: 339475: 5b59ad86df07a457b5ab58ed4871195c8f13cb61 v: v3 --- [refs] | 2 +- trunk/fs/cifs/Kconfig | 10 +++++++++- trunk/fs/cifs/cifs_debug.h | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4bd607dda87e..78f432292c27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bde98197310fd085ee4bb00ab310abcbe55b0664 +refs/heads/master: 471b1f98719a8e8f34f3a696d488e50754f8cf73 diff --git a/trunk/fs/cifs/Kconfig b/trunk/fs/cifs/Kconfig index 2075ddfffa73..21ff76c22a17 100644 --- a/trunk/fs/cifs/Kconfig +++ b/trunk/fs/cifs/Kconfig @@ -122,9 +122,17 @@ config CIFS_ACL Allows fetching CIFS/NTFS ACL from the server. The DACL blob is handed over to the application/caller. +config CIFS_DEBUG + bool "Enable CIFS debugging routines" + default y + depends on CIFS + help + Enabling this option adds helpful debugging messages to + the cifs code which increases the size of the cifs module. + If unsure, say Y. config CIFS_DEBUG2 bool "Enable additional CIFS debugging routines" - depends on CIFS + depends on CIFS_DEBUG help Enabling this option adds a few more debugging routines to the cifs code which slightly increases the size of diff --git a/trunk/fs/cifs/cifs_debug.h b/trunk/fs/cifs/cifs_debug.h index 4d12fe48fb50..86e92ef2abc1 100644 --- a/trunk/fs/cifs/cifs_debug.h +++ b/trunk/fs/cifs/cifs_debug.h @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#define CIFS_DEBUG /* BB temporary */ #ifndef _H_CIFS_DEBUG #define _H_CIFS_DEBUG @@ -44,7 +43,7 @@ extern int cifsERROR; * debug ON * -------- */ -#ifdef CIFS_DEBUG +#ifdef CONFIG_CIFS_DEBUG /* information message: e.g., configuration, major event */ #define cifsfyi(fmt, ...) \