cifs: eliminate cifsERROR variable

It's always set to "1" and there's no way to change it to anything else.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h
index 86e92ef..69ae3d3 100644 (file)
--- a/fs/cifs/cifs_debug.h
+++ b/fs/cifs/cifs_debug.h
@@ -37,7 +37,6 @@ void dump_smb(void *, int);
 #define CIFS_TIMER     0x04
 
 extern int cifsFYI;
-extern int cifsERROR;
 
 /*
  *     debug ON
@@ -64,10 +63,7 @@ do {                                                                 \
 
 /* error event message: e.g., i/o error */
 #define cifserror(fmt, ...)                                            \
-do {                                                                   \
-       if (cifsERROR)                                                  \
-               printk(KERN_ERR "CIFS VFS: " fmt "\n", ##__VA_ARGS__);  \
-} while (0)
+       printk(KERN_ERR "CIFS VFS: " fmt "\n", ##__VA_ARGS__);          \
 
 #define cERROR(set, fmt, ...)                                          \
 do {                                                                   \

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index ce9f3c5..f653835 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -54,7 +54,6 @@
 #endif
 
 int cifsFYI = 0;
-int cifsERROR = 1;
 int traceSMB = 0;
 bool enable_oplocks = true;
 unsigned int linuxExtEnabled = 1;