]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tracing: fix librados signed/unsigned warnings 6312/head
authorSage Weil <sage@redhat.com>
Sun, 8 Nov 2015 14:32:44 +0000 (09:32 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Nov 2015 14:03:23 +0000 (09:03 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/tracing/librados.tp
src/tracing/tracing-common.h

index 5bb6ee7f111bba0816282219dcbf3d5821a43c70..993bf7193e97ce232b85f1340de483afb21b4d69 100644 (file)
@@ -1591,7 +1591,7 @@ TRACEPOINT_EVENT(librados, rados_tmap_get_exit,
         int, len),
     TP_FIELDS(
         ctf_integer(int, retval, retval)
-        ctf_sequence(unsigned char, buf, buf, uint32_t, CEPH_MIN(len, CEPH_TRACE_BUF_TRUNC_LEN))
+        ctf_sequence(unsigned char, buf, buf, uint32_t, CEPH_MIN((size_t)len, CEPH_TRACE_BUF_TRUNC_LEN))
         ctf_integer(int, len, len)
     )
 )
index 2ab1b764bfc27a3e62cd64268da2a5a5a48904ef..aed412246c2167b3e75a0ee0b3bddcbf4e2fd491 100644 (file)
@@ -4,7 +4,7 @@
 // Amount of buffer data to dump when using ceph_ctf_sequence or ceph_ctf_sequencep.
 // If 0, then *_data field is omitted entirely.
 #if !defined(CEPH_TRACE_BUF_TRUNC_LEN)
-#define CEPH_TRACE_BUF_TRUNC_LEN 0
+#define CEPH_TRACE_BUF_TRUNC_LEN 0u
 #endif
 
 // TODO: This is GCC-specific.  Replace CEPH_MAX and CEPH_MIN with standard macros, if possible.