Commit a948b114 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

NFSD: Fix TP_printk() format specifier in nfsd_clid_class 



Since commit 9a6944fe ("tracing: Add a verifier to check string
pointers for trace events"), which was merged in v5.13-rc1,
TP_printk() no longer tacitly supports the "%.*s" format specifier.

These are low value tracepoints, so just remove them.

Reported-by: default avatarDavid Wysochanski <dwysocha@redhat.com>
Fixes: dd5e3fbc ("NFSD: Add tracepoints to the NFSD state management code")
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent d07f6ca9

fs/nfsd/nfs4state.c

+0 −3
Original line number Diff line number Diff line
@@ -7229,7 +7229,6 @@ nfs4_client_to_reclaim(struct xdr_netobj name, struct xdr_netobj princhash, 
	unsigned int strhashval;

	struct nfs4_client_reclaim *crp;



	trace_nfsd_clid_reclaim(nn, name.len, name.data);

	crp = alloc_reclaim();

	if (crp) {

		strhashval = clientstr_hashval(name);
@@ -7279,8 +7278,6 @@ nfsd4_find_reclaim_client(struct xdr_netobj name, struct nfsd_net *nn) 
	unsigned int strhashval;

	struct nfs4_client_reclaim *crp = NULL;



	trace_nfsd_clid_find(nn, name.len, name.data);



	strhashval = clientstr_hashval(name);

	list_for_each_entry(crp, &nn->reclaim_str_hashtbl[strhashval], cr_strhash) {

		if (compare_blob(&crp->cr_name, &name) == 0) {

fs/nfsd/trace.h

+0 −29
Original line number Diff line number Diff line
@@ -536,35 +536,6 @@ DEFINE_EVENT(nfsd_net_class, nfsd_##name, \ 
DEFINE_NET_EVENT(grace_start);

DEFINE_NET_EVENT(grace_complete);



DECLARE_EVENT_CLASS(nfsd_clid_class,

	TP_PROTO(const struct nfsd_net *nn,

		 unsigned int namelen,

		 const unsigned char *namedata),

	TP_ARGS(nn, namelen, namedata),

	TP_STRUCT__entry(

		__field(unsigned long long, boot_time)

		__field(unsigned int, namelen)

		__dynamic_array(unsigned char,  name, namelen)

	),

	TP_fast_assign(

		__entry->boot_time = nn->boot_time;

		__entry->namelen = namelen;

		memcpy(__get_dynamic_array(name), namedata, namelen);

	),

	TP_printk("boot_time=%16llx nfs4_clientid=%.*s",

		__entry->boot_time, __entry->namelen, __get_str(name))

)



#define DEFINE_CLID_EVENT(name) \

DEFINE_EVENT(nfsd_clid_class, nfsd_clid_##name, \

	TP_PROTO(const struct nfsd_net *nn, \

		 unsigned int namelen, \

		 const unsigned char *namedata), \

	TP_ARGS(nn, namelen, namedata))



DEFINE_CLID_EVENT(find);

DEFINE_CLID_EVENT(reclaim);



TRACE_EVENT(nfsd_clid_inuse_err,

	TP_PROTO(const struct nfs4_client *clp),

	TP_ARGS(clp),