From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Nov 2015 14:32:44 +0000 (-0500)
Subject: tracing: fix librados signed/unsigned warnings
X-Git-Tag: v10.0.1~116^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6312%2Fhead;p=ceph.git

tracing: fix librados signed/unsigned warnings

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/tracing/librados.tp b/src/tracing/librados.tp
index 5bb6ee7f111b..993bf7193e97 100644
--- a/src/tracing/librados.tp
+++ b/src/tracing/librados.tp
@@ -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)
     )
 )
diff --git a/src/tracing/tracing-common.h b/src/tracing/tracing-common.h
index 2ab1b764bfc2..aed412246c21 100644
--- a/src/tracing/tracing-common.h
+++ b/src/tracing/tracing-common.h
@@ -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.