cifs: Add CONFIG_CIFS_DEBUG and rename use of CIFS_DEBUG

This can reduce the size of the module by ~120KB which
could be useful for embedded systems.

$ size fs/cifs/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 388567	  34459	 100440	 523466	  7fcca	fs/cifs/built-in.o.new
 495970	  34599	 117904	 648473	  9e519	fs/cifs/built-in.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>

diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig
index 2075ddfffa7334ca4a3ff06214b56ced4882abc6..21ff76c22a17f2524c706dde8568344921124681 100644 (file)
--- a/fs/cifs/Kconfig
+++ b/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/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h
index 4d12fe48fb5044e5b66292eb3fabb6dcfaebc65d..86e92ef2abc1e8c3aa5cdfe142acbc2adb73f9f0 100644 (file)
--- a/fs/cifs/cifs_debug.h
+++ b/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, ...)                                              \