Skip to content

Commit a68d5a5

Browse files
committed
SUNRPC: Refresh the show_rqstp_flags() macro
Ensure that show_rqstp_flags() can recognize and display the RQ_AUTHERR flag, added in commit 83dd59a ("SUNRPC/nfs: Fix return value for nfs4_callback_compound()") and the RQ_DATA flag, added in commit ff3ac5c ("SUNRPC: Add a server side per-connection limit"). Signed-off-by: Chuck Lever <[email protected]>
1 parent 94a4bea commit a68d5a5

File tree

1 file changed

+27
-8
lines changed

1 file changed

+27
-8
lines changed

include/trace/events/sunrpc.h

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,15 +1250,34 @@ DECLARE_EVENT_CLASS(svc_xdr_buf_class,
12501250
DEFINE_SVCXDRBUF_EVENT(recvfrom);
12511251
DEFINE_SVCXDRBUF_EVENT(sendto);
12521252

1253+
/*
1254+
* from include/linux/sunrpc/svc.h
1255+
*/
1256+
#define SVC_RQST_FLAG_LIST \
1257+
svc_rqst_flag(SECURE) \
1258+
svc_rqst_flag(LOCAL) \
1259+
svc_rqst_flag(USEDEFERRAL) \
1260+
svc_rqst_flag(DROPME) \
1261+
svc_rqst_flag(SPLICE_OK) \
1262+
svc_rqst_flag(VICTIM) \
1263+
svc_rqst_flag(BUSY) \
1264+
svc_rqst_flag(DATA) \
1265+
svc_rqst_flag_end(AUTHERR)
1266+
1267+
#undef svc_rqst_flag
1268+
#undef svc_rqst_flag_end
1269+
#define svc_rqst_flag(x) TRACE_DEFINE_ENUM(RQ_##x);
1270+
#define svc_rqst_flag_end(x) TRACE_DEFINE_ENUM(RQ_##x);
1271+
1272+
SVC_RQST_FLAG_LIST
1273+
1274+
#undef svc_rqst_flag
1275+
#undef svc_rqst_flag_end
1276+
#define svc_rqst_flag(x) { BIT(RQ_##x), #x },
1277+
#define svc_rqst_flag_end(x) { BIT(RQ_##x), #x }
1278+
12531279
#define show_rqstp_flags(flags) \
1254-
__print_flags(flags, "|", \
1255-
{ (1UL << RQ_SECURE), "RQ_SECURE"}, \
1256-
{ (1UL << RQ_LOCAL), "RQ_LOCAL"}, \
1257-
{ (1UL << RQ_USEDEFERRAL), "RQ_USEDEFERRAL"}, \
1258-
{ (1UL << RQ_DROPME), "RQ_DROPME"}, \
1259-
{ (1UL << RQ_SPLICE_OK), "RQ_SPLICE_OK"}, \
1260-
{ (1UL << RQ_VICTIM), "RQ_VICTIM"}, \
1261-
{ (1UL << RQ_BUSY), "RQ_BUSY"})
1280+
__print_flags(flags, "|", SVC_RQST_FLAG_LIST)
12621281

12631282
TRACE_EVENT(svc_recv,
12641283
TP_PROTO(struct svc_rqst *rqst, int len),

0 commit comments

Comments
 (0)