diff options
| -rw-r--r-- | fs/cifs/cifs_debug.h | 6 | ||||
| -rw-r--r-- | fs/cifs/cifsfs.c | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h index 86e92ef2abc1..69ae3d3c3b31 100644 --- a/fs/cifs/cifs_debug.h +++ b/fs/cifs/cifs_debug.h | |||
| @@ -37,7 +37,6 @@ void dump_smb(void *, int); | |||
| 37 | #define CIFS_TIMER 0x04 | 37 | #define CIFS_TIMER 0x04 |
| 38 | 38 | ||
| 39 | extern int cifsFYI; | 39 | extern int cifsFYI; |
| 40 | extern int cifsERROR; | ||
| 41 | 40 | ||
| 42 | /* | 41 | /* |
| 43 | * debug ON | 42 | * debug ON |
| @@ -64,10 +63,7 @@ do { \ | |||
| 64 | 63 | ||
| 65 | /* error event message: e.g., i/o error */ | 64 | /* error event message: e.g., i/o error */ |
| 66 | #define cifserror(fmt, ...) \ | 65 | #define cifserror(fmt, ...) \ |
| 67 | do { \ | 66 | printk(KERN_ERR "CIFS VFS: " fmt "\n", ##__VA_ARGS__); \ |
| 68 | if (cifsERROR) \ | ||
| 69 | printk(KERN_ERR "CIFS VFS: " fmt "\n", ##__VA_ARGS__); \ | ||
| 70 | } while (0) | ||
| 71 | 67 | ||
| 72 | #define cERROR(set, fmt, ...) \ | 68 | #define cERROR(set, fmt, ...) \ |
| 73 | do { \ | 69 | do { \ |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ce9f3c5421bf..f653835d067b 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | #endif | 54 | #endif |
| 55 | 55 | ||
| 56 | int cifsFYI = 0; | 56 | int cifsFYI = 0; |
| 57 | int cifsERROR = 1; | ||
| 58 | int traceSMB = 0; | 57 | int traceSMB = 0; |
| 59 | bool enable_oplocks = true; | 58 | bool enable_oplocks = true; |
| 60 | unsigned int linuxExtEnabled = 1; | 59 | unsigned int linuxExtEnabled = 1; |
