2 files changed, 22 insertions, 29 deletions

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index e35e711db68e..9d69ea433330 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -42,23 +42,6 @@ cifs_dump_mem(char *label, void *data, int length)
                        data, length, true);
 }
 
-#ifdef CONFIG_CIFS_DEBUG
-void cifs_vfs_err(const char *fmt, ...)
-{
-        struct va_format vaf;
-        va_list args;
-
-        va_start(args, fmt);
-
-        vaf.fmt = fmt;
-        vaf.va = &args;
-
-        pr_err_ratelimited("CIFS VFS: %pV", &vaf);
-
-        va_end(args);
-}
-#endif
-
 void cifs_dump_detail(void *buf)
 {
 #ifdef CONFIG_CIFS_DEBUG2
diff --git a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h
index c611ca2339d7..fe5567655662 100644
--- a/fs/cifs/cifs_debug.h
+++ b/fs/cifs/cifs_debug.h
@@ -39,6 +39,7 @@ extern int cifsFYI;
 #else
 #define NOISY 0
 #endif
+#define ONCE 8
 
 /*
  *      debug ON
@@ -46,19 +47,28 @@ extern int cifsFYI;
  */
 #ifdef CONFIG_CIFS_DEBUG
 
-__printf(1, 2) void cifs_vfs_err(const char *fmt, ...);
-
 /* information message: e.g., configuration, major event */
-#define cifs_dbg(type, fmt, ...)                                        \
-do {                                                                    \
-        if (type == FYI && cifsFYI & CIFS_INFO) {                       \
-                pr_debug_ratelimited("%s: "                             \
-                            fmt, __FILE__, ##__VA_ARGS__);              \
-        } else if (type == VFS) {                                       \
-                cifs_vfs_err(fmt, ##__VA_ARGS__);                       \
-        } else if (type == NOISY && type != 0) {                        \
-                pr_debug_ratelimited(fmt, ##__VA_ARGS__);               \
-        }                                                               \
+#define cifs_dbg_func(ratefunc, type, fmt, ...)                 \
+do {                                                            \
+        if ((type) & FYI && cifsFYI & CIFS_INFO) {              \
+                pr_debug_ ## ratefunc("%s: "                    \
+                                fmt, __FILE__, ##__VA_ARGS__);  \
+        } else if ((type) & VFS) {                              \
+                pr_err_ ## ratefunc("CuIFS VFS: "               \
+                                 fmt, ##__VA_ARGS__);           \
+        } else if ((type) & NOISY && (NOISY != 0)) {            \
+                pr_debug_ ## ratefunc(fmt, ##__VA_ARGS__);      \
+        }                                                       \
+} while (0)
+
+#define cifs_dbg(type, fmt, ...) \
+do {                                                    \
+        if ((type) & ONCE)                              \
+                cifs_dbg_func(once,                     \
+                         type, fmt, ##__VA_ARGS__);     \
+        else                                            \
+                cifs_dbg_func(ratelimited,              \
+                        type, fmt, ##__VA_ARGS__);      \
 } while (0)
 
 /*