From 58696c18dcb61d7ba80949ebc0fa70f2fb1c71ed Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 18 Dec 2012 06:35:10 -0500
Subject: [PATCH] --- yaml --- r: 347979 b: refs/heads/master c:
 9acbd26b0a5ac4a3d52d31034feb3d935e39032a h: refs/heads/master i:   347977:
 aea0594efe917e6489755b272eaae13cd698def5   347975:
 b8be08165f35dd79112ccb9e1d24a37a6130a1ee v: v3

---
 [refs]                     | 2 +-
 trunk/fs/cifs/cifs_debug.h | 6 +-----
 trunk/fs/cifs/cifsfs.c     | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9182d96ac598..715be49185cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f2591a34db6c9361faa316c91a6e320cb4e6aee
+refs/heads/master: 9acbd26b0a5ac4a3d52d31034feb3d935e39032a
diff --git a/trunk/fs/cifs/cifs_debug.h b/trunk/fs/cifs/cifs_debug.h
index 86e92ef2abc1..69ae3d3c3b31 100644
--- a/trunk/fs/cifs/cifs_debug.h
+++ b/trunk/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/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
index ce9f3c5421bf..f653835d067b 100644
--- a/trunk/fs/cifs/cifsfs.c
+++ b/trunk/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;