tmp

diff --git a/include/linux/ceph/ceph_debug.h b/include/linux/ceph/ceph_debug.h
index b39707794d767b171f175d5c19bf20b35f2e24ea..e7ae9c7a4fc5baa8dee9dcb8d91801196c3183d8 100644 (file)
--- a/include/linux/ceph/ceph_debug.h
+++ b/include/linux/ceph/ceph_debug.h
@@ -51,9 +51,9 @@
  * or, just wrap pr_debug
  */
 # define dout(fmt, ...)        CEPH_SAN_LOG(fmt, ##__VA_ARGS__)
-# define doutc(client, fmt, ...)                                       \
+# define doutc(client, fmt, ...) \
        CEPH_SAN_LOG("[%pU:%llu] " fmt, &client->fsid,                  \
-                client->monc.auth->global_id, ##__VA_ARGS__);
+                client->monc.auth->global_id, ##__VA_ARGS__)
 
 #endif
 

diff --git a/include/linux/ceph/ceph_san_logger.h b/include/linux/ceph/ceph_san_logger.h
index b007c0cff4f2d9ac74415d16a5388786109a1ac5..0a4dde8e917f285f7b6ffb0bbbdbf856fa63a3d2 100644 (file)
--- a/include/linux/ceph/ceph_san_logger.h
+++ b/include/linux/ceph/ceph_san_logger.h
@@ -95,9 +95,6 @@ struct ceph_san_tls_ctx *ceph_san_get_tls_ctx(void);
             __size = ceph_san_cnt(__VA_ARGS__); \
         } \
         __buffer = ceph_san_log(__source_id, __size); \
-        if (__buffer) { \
-            ceph_san_ser(__buffer, ##__VA_ARGS__); \
-        } \
     } while (0)
 
 /* Global logger instance */

diff --git a/include/linux/ceph/ceph_san_ser.h b/include/linux/ceph/ceph_san_ser.h
index affe0632bece709bbabeb0d4b9d7a2733fdb3588..f389d383cbada559eb2aab18e762fc42139ae8a2 100644 (file)
--- a/include/linux/ceph/ceph_san_ser.h
+++ b/include/linux/ceph/ceph_san_ser.h
@@ -46,8 +46,8 @@
 #define ceph_san_cnt(...)       ___ceph_san_apply(___ceph_san_cnt, ceph_san_narg(__VA_ARGS__))(__VA_ARGS__)
 
 #define __ceph_san_ser(__buffer, __t) (*(typeof(__t)*)__buffer = (__t), __buffer = (void*)((typeof(__t)*)__buffer + 1))
-#define ___ceph_san_ser0(__buffer)             (__buffer)
-#define ___ceph_san_ser1(__buffer, __t)                (__ceph_san_ser(__buffer, __t), ___ceph_san_ser0(__buffer))
+#define ___ceph_san_ser0(__buffer)
+#define ___ceph_san_ser1(__buffer, __t)                (__ceph_san_ser(__buffer, __t))
 #define ___ceph_san_ser2(__buffer, __t, __args...)     (__ceph_san_ser(__buffer, __t), ___ceph_san_ser1(__buffer, __args))
 #define ___ceph_san_ser3(__buffer, __t, __args...)     (__ceph_san_ser(__buffer, __t), ___ceph_san_ser2(__buffer, __args))
 #define ___ceph_san_ser4(__buffer, __t, __args...)     (__ceph_san_ser(__buffer, __t), ___ceph_san_ser3(__buffer, __args))