NFSD: Remove definition for trace_nfsd_file_unhash_and_queue
Subsystems (2)
Chuck Lever
maintainerPATCH 1/5 NFSD: Remove definition for trace_nfsd_file_unhash_and_queue
From: Chuck Lever <[email protected]>
trace_nfsd_file_unhash_and_queue() was removed by commit ac3a2585f01 ("nfsd: rework refcounting in filecache").
--- fs/nfsd/trace.h | 1 - 1 file changed, 1 deletion(-)
fs/nfsd/trace.h +0 -1
@@ -1108,7 +1108,6 @@ DEFINE_NFSD_FILE_EVENT(nfsd_file_free);DEFINE_NFSD_FILE_EVENT (nfsd_file_unhash);DEFINE_NFSD_FILE_EVENT (nfsd_file_put);DEFINE_NFSD_FILE_EVENT (nfsd_file_closing); -DEFINE_NFSD_FILE_EVENT (nfsd_file_unhash_and_queue); TRACE_EVENT(nfsd_file_alloc, TP_PROTO(
Signature · 1 line
2.49.0
Chuck Lever
maintainerPATCH 2/5 NFSD: Remove definitions for unused trace_nfsd_file_lru trace points
From: Chuck Lever <[email protected]>
Events nfsd_file_lru_add_disposed and nfsd_file_lru_del_disposed were added by commit 4a0e73e635e3 ("NFSD: Leave open files out of the filecache LRU") but they were never used.
--- fs/nfsd/trace.h | 2 -- 1 file changed, 2 deletions(-)
fs/nfsd/trace.h +0 -2
@@ -1343,9 +1343,7 @@ DEFINE_EVENT(nfsd_file_gc_class, name, \ TP_ARGS(nf))DEFINE_NFSD_FILE_GC_EVENT (nfsd_file_lru_add); -DEFINE_NFSD_FILE_GC_EVENT (nfsd_file_lru_add_disposed);DEFINE_NFSD_FILE_GC_EVENT (nfsd_file_lru_del); -DEFINE_NFSD_FILE_GC_EVENT (nfsd_file_lru_del_disposed);DEFINE_NFSD_FILE_GC_EVENT (nfsd_file_gc_in_use);DEFINE_NFSD_FILE_GC_EVENT (nfsd_file_gc_writeback);DEFINE_NFSD_FILE_GC_EVENT (nfsd_file_gc_referenced);
Signature · 1 line
2.49.0
Chuck Lever
maintainerPATCH 3/5 NFSD: Remove definition for trace_nfsd_file_gc_recent
In reply to Chuck LeverFrom: Chuck Lever <[email protected]>
Event nfsd_file_gc_recent was added by commit 64912122a4f8 ("nfsd:
filecache: introduce NFSD_FILE_RECENT") but never used.
--- fs/nfsd/trace.h | 1 - 1 file changed, 1 deletion(-)
fs/nfsd/trace.h +0 -1
@@ -1377,7 +1377,6 @@ DEFINE_EVENT(nfsd_file_lruwalk_class, name, \ TP_ARGS(removed, remaining))DEFINE_NFSD_FILE_LRUWALK_EVENT (nfsd_file_gc_removed); -DEFINE_NFSD_FILE_LRUWALK_EVENT (nfsd_file_gc_recent);DEFINE_NFSD_FILE_LRUWALK_EVENT (nfsd_file_shrinker_removed); TRACE_EVENT(nfsd_file_close,
Signature · 1 line
2.49.0
Chuck Lever
maintainerPATCH 4/5 NFSD: Remove definition for trace_nfsd_ctl_maxconn
In reply to Chuck LeverFrom: Chuck Lever <[email protected]>
trace_nfsd_ctl_maxconn() was removed by commit a4b853f183a1 ("sunrpc: remove all connection limit configuration") but did not remove the event.
--- fs/nfsd/trace.h | 19 ------------------- 1 file changed, 19 deletions(-)
fs/nfsd/trace.h +0 -19
@@ -2099,25 +2099,6 @@ TRACE_EVENT(nfsd_ctl_maxblksize, ) ); -TRACE_EVENT (nfsd_ctl_maxconn, -TP_PROTO ( - const struct net *net, - int maxconn - ), -TP_ARGS (net, maxconn), -TP_STRUCT__entry ( - __field(unsigned int, netns_ino) -__field (int, maxconn) - ), -TP_fast_assign ( - __entry->netns_ino = net->ns.inum; - __entry->maxconn = maxconn; - ), -TP_printk ("maxconn=%d" , - __entry->maxconn - ) -); - TRACE_EVENT(nfsd_ctl_time, TP_PROTO( const struct net *net,
Signature · 1 line
2.49.0
Chuck Lever
maintainerPATCH 5/5 NFSD: Clean up kdoc for nfsd_file_put_local()
In reply to Chuck LeverFrom: Chuck Lever <[email protected]>
Sparse reports that the synopsis of nfsd_file_put_local() does not match its kdoc comment. Introduced by commit c25a89770d1f ("nfs_localio: change nfsd_file_put_local() to take a pointer to __rcu pointer").
--- fs/nfsd/filecache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/filecache.c +1 -1
@@ -372,7 +372,7 @@ nfsd_file_put(struct nfsd_file *nf)/** * nfsd_file_put_local - put nfsd_file reference and arm nfsd_net_put in caller -* @nf: nfsd_file of which to put the reference +* @pnf: nfsd_file of which to put the reference * * First save the associated net to return to caller, then put * the reference of the nfsd_file.
Signature · 1 line
2.49.0
Quoted 16 lines · Chuck Lever
From: Chuck Lever <[email protected]>
trace_nfsd_file_unhash_and_queue()was removed by commitac3a2585f01("nfsd: rework refcounting in filecache").Reported-by Steven Rostedt <[email protected]>Signed-off-by Chuck Lever <[email protected]>--- fs/nfsd/trace.h | 1 - 1 file changed, 1 deletion(-)fs/nfsd/trace.h +0
-0
fs/nfsd/trace.h DEFINE_NFSD_FILE_EVENT(nfsd_file_free); · line 1113
Quoted 7 lines
fs/nfsd/trace.h +0
-1@@ -1108,7 +1108,6 @@ DEFINE_NFSD_FILE_EVENT(nfsd_file_free);DEFINE_NFSD_FILE_EVENT (nfsd_file_unhash);DEFINE_NFSD_FILE_EVENT (nfsd_file_put);DEFINE_NFSD_FILE_EVENT (nfsd_file_closing); -DEFINE_NFSD_FILE_EVENT (nfsd_file_unhash_and_queue); TRACE_EVENT(nfsd_file_alloc, TP_PROTO(
You can add this to all 5: