This is a note to let you know that I've just added the patch titled
NFSD: Remove trace_nfsd_clid_inuse_err
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfsd-remove-trace_nfsd_clid_inuse_err.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 297653df040256cafa90c5a75af75a59068a8ecc
Author: Chuck Lever <chuck.lever@xxxxxxxxxx>
Date: Fri May 14 15:55:42 2021 -0400
NFSD: Remove trace_nfsd_clid_inuse_err
[ Upstream commit 0bfaacac57e64aa342f865b8ddcab06ca59a6f83 ]
This tracepoint has been replaced by nfsd_clid_cred_mismatch and
nfsd_clid_verf_mismatch, and can simply be removed.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 0ab46a0c911d2..2fac89e29f515 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -596,30 +596,6 @@ TRACE_EVENT(nfsd_clid_verf_mismatch,
)
);
-TRACE_EVENT(nfsd_clid_inuse_err,
- TP_PROTO(const struct nfs4_client *clp),
- TP_ARGS(clp),
- TP_STRUCT__entry(
- __field(u32, cl_boot)
- __field(u32, cl_id)
- __array(unsigned char, addr, sizeof(struct sockaddr_in6))
- __field(unsigned int, namelen)
- __dynamic_array(unsigned char, name, clp->cl_name.len)
- ),
- TP_fast_assign(
- __entry->cl_boot = clp->cl_clientid.cl_boot;
- __entry->cl_id = clp->cl_clientid.cl_id;
- memcpy(__entry->addr, &clp->cl_addr,
- sizeof(struct sockaddr_in6));
- __entry->namelen = clp->cl_name.len;
- memcpy(__get_dynamic_array(name), clp->cl_name.data,
- clp->cl_name.len);
- ),
- TP_printk("nfs4_clientid %.*s already in use by %pISpc, client %08x:%08x",
- __entry->namelen, __get_str(name), __entry->addr,
- __entry->cl_boot, __entry->cl_id)
-)
-
/*
* from fs/nfsd/filecache.h
*/
