Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: Combine XDR error tracepoints

Browse source 
[ Upstream commit 70e94d757b3e1f46486d573729d84c8955c81dce ]

Clean up: The garbage_args and cant_encode tracepoints report the
same information as each other, so combine them into a single
tracepoint class to reduce code duplication and slightly reduce the
size of trace.o.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2021-10-21 12:11:45 -04:00 • committed by Ksawlii
parent fefe2352c2
commit 0b68d96667
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
fs/nfsd/trace.h
View file

@ -46,7 +46,7 @@
rqstp->rq_xprt->xpt_remotelen); \ rqstp->rq_xprt->xpt_remotelen); \
} while (0); } while (0);
TRACE_EVENT(nfsd_garbage_args_err, DECLARE_EVENT_CLASS(nfsd_xdr_err_class,
TP_PROTO( TP_PROTO(
const struct svc_rqst *rqstp const struct svc_rqst *rqstp
), ),
@ -68,27 +68,13 @@ TRACE_EVENT(nfsd_garbage_args_err,
) )
); );
TRACE_EVENT(nfsd_cant_encode_err, #define DEFINE_NFSD_XDR_ERR_EVENT(name) \
TP_PROTO( DEFINE_EVENT(nfsd_xdr_err_class, nfsd_##name##_err, \
const struct svc_rqst *rqstp TP_PROTO(const struct svc_rqst *rqstp), \
), TP_ARGS(rqstp))
TP_ARGS(rqstp),
TP_STRUCT__entry(
NFSD_TRACE_PROC_ARG_FIELDS
__field(u32, vers) DEFINE_NFSD_XDR_ERR_EVENT(garbage_args);
__field(u32, proc) DEFINE_NFSD_XDR_ERR_EVENT(cant_encode);
),
TP_fast_assign(
NFSD_TRACE_PROC_ARG_ASSIGNMENTS
__entry->vers = rqstp->rq_vers;
__entry->proc = rqstp->rq_proc;
),
TP_printk("xid=0x%08x vers=%u proc=%u",
__entry->xid, __entry->vers, __entry->proc
)
);
#define show_nfsd_may_flags(x) \ #define show_nfsd_may_flags(x) \
__print_flags(x, "|", \ __print_flags(x, "|", \