Commit d27b74a8 authored by Chuck Lever's avatar Chuck Lever

NFSD: Use new __string_len C macros for nfsd_clid_class

Clean up.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 408c0de7
...@@ -606,7 +606,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class, ...@@ -606,7 +606,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class,
__array(unsigned char, addr, sizeof(struct sockaddr_in6)) __array(unsigned char, addr, sizeof(struct sockaddr_in6))
__field(unsigned long, flavor) __field(unsigned long, flavor)
__array(unsigned char, verifier, NFS4_VERIFIER_SIZE) __array(unsigned char, verifier, NFS4_VERIFIER_SIZE)
__dynamic_array(char, name, clp->cl_name.len + 1) __string_len(name, name, clp->cl_name.len)
), ),
TP_fast_assign( TP_fast_assign(
__entry->cl_boot = clp->cl_clientid.cl_boot; __entry->cl_boot = clp->cl_clientid.cl_boot;
...@@ -616,8 +616,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class, ...@@ -616,8 +616,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class,
__entry->flavor = clp->cl_cred.cr_flavor; __entry->flavor = clp->cl_cred.cr_flavor;
memcpy(__entry->verifier, (void *)&clp->cl_verifier, memcpy(__entry->verifier, (void *)&clp->cl_verifier,
NFS4_VERIFIER_SIZE); NFS4_VERIFIER_SIZE);
memcpy(__get_str(name), clp->cl_name.data, clp->cl_name.len); __assign_str_len(name, clp->cl_name.data, clp->cl_name.len);
__get_str(name)[clp->cl_name.len] = '\0';
), ),
TP_printk("addr=%pISpc name='%s' verifier=0x%s flavor=%s client=%08x:%08x", TP_printk("addr=%pISpc name='%s' verifier=0x%s flavor=%s client=%08x:%08x",
__entry->addr, __get_str(name), __entry->addr, __get_str(name),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment