Skip to content

Commit 21a3f33

Browse files
azeemshaikh38chucklever
authored andcommitted
NFSD: Remove open coding of string copy
Instead of open coding a __dynamic_array(), use the __string() and __assign_str() helper macros that exist for this kind of use case. Part of an effort to remove deprecated strlcpy() [1] completely from the kernel[2]. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy [2] KSPP#89 Fixes: 3c92fba ("NFSD: Enhance the nfsd_cb_setup tracepoint") Signed-off-by: Azeem Shaikh <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 07a2730 commit 21a3f33

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

fs/nfsd/trace.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,19 +1365,19 @@ TRACE_EVENT(nfsd_cb_setup,
13651365
__field(u32, cl_id)
13661366
__field(unsigned long, authflavor)
13671367
__sockaddr(addr, clp->cl_cb_conn.cb_addrlen)
1368-
__array(unsigned char, netid, 8)
1368+
__string(netid, netid)
13691369
),
13701370
TP_fast_assign(
13711371
__entry->cl_boot = clp->cl_clientid.cl_boot;
13721372
__entry->cl_id = clp->cl_clientid.cl_id;
1373-
strlcpy(__entry->netid, netid, sizeof(__entry->netid));
1373+
__assign_str(netid, netid);
13741374
__entry->authflavor = authflavor;
13751375
__assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr,
13761376
clp->cl_cb_conn.cb_addrlen)
13771377
),
13781378
TP_printk("addr=%pISpc client %08x:%08x proto=%s flavor=%s",
13791379
__get_sockaddr(addr), __entry->cl_boot, __entry->cl_id,
1380-
__entry->netid, show_nfsd_authflavor(__entry->authflavor))
1380+
__get_str(netid), show_nfsd_authflavor(__entry->authflavor))
13811381
);
13821382

13831383
TRACE_EVENT(nfsd_cb_setup_err,

0 commit comments

Comments
 (0)