[CIFS] clean up some hard to read ifdefs

Christoph had noticed too many ifdefs in the CIFS code making it
hard to read.  This patch removes about a quarter of them from
the C files in cifs by improving a few key ifdefs in the .h files.

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index 7c51e2e9a9f7..3b5a5ce882b6 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -150,9 +150,7 @@ static int canonicalize_unc(char *cp)
                 if (cp[i] == '\\')
                         break;
                 if (cp[i] == '/') {
-#ifdef CONFIG_CIFS_DEBUG2
-                        cFYI(1, ("change slash to backslash in malformed UNC"));
-#endif
+                        cFYI(DBG2, ("change slash to \\ in malformed UNC"));
                         cp[i] = '\\';
                         return 1;
                 }
@@ -178,9 +176,7 @@ cifs_inet_pton(int address_family, char *cp, void *dst)
         } else if (address_family == AF_INET6) {
                 ret = in6_pton(cp, -1 /* len */, dst , '\\', NULL);
         }
-#ifdef CONFIG_CIFS_DEBUG2
-        cFYI(1, ("address conversion returned %d for %s", ret, cp));
-#endif
+        cFYI(DBG2, ("address conversion returned %d for %s", ret, cp));
         if (ret > 0)
                 ret = 1;
         return ret;