From 8ad594fb05450725fdd138666796407284b7806a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 8 Nov 2015 09:32:44 -0500 Subject: [PATCH] tracing: fix librados signed/unsigned warnings Signed-off-by: Sage Weil --- src/tracing/librados.tp | 2 +- src/tracing/tracing-common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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. -- 2.47.3