Merge tag 'nfsd-5.16' of git://linux-nfs.org/~bfields/linux

Pull nfsd updates from Bruce Fields:
 "A slow cycle for nfsd: mainly cleanup, including Neil's patch dropping
  support for a filehandle format deprecated 20 years ago, and further
  xdr-related cleanup from Chuck"

* tag 'nfsd-5.16' of git://linux-nfs.org/~bfields/linux: (26 commits)
  nfsd4: remove obselete comment
  nfsd: document server-to-server-copy parameters
  NFSD:fix boolreturn.cocci warning
  nfsd: update create verifier comment
  SUNRPC: Change return value type of .pc_encode
  SUNRPC: Replace the "__be32 *p" parameter to .pc_encode
  NFSD: Save location of NFSv4 COMPOUND status
  SUNRPC: Change return value type of .pc_decode
  SUNRPC: Replace the "__be32 *p" parameter to .pc_decode
  SUNRPC: De-duplicate .pc_release() call sites
  SUNRPC: Simplify the SVC dispatch code path
  SUNRPC: Capture value of xdr_buf::page_base
  SUNRPC: Add trace event when alloc_pages_bulk() makes no progress
  svcrdma: Split svcrmda_wc_{read,write} tracepoints
  svcrdma: Split the svcrdma_wc_send() tracepoint
  svcrdma: Split the svcrdma_wc_receive() tracepoint
  NFSD: Have legacy NFSD WRITE decoders use xdr_stream_subsegment()
  SUNRPC: xdr_stream_subsegment() must handle non-zero page_bases
  NFSD: Initialize pointer ni with NULL and not plain integer 0
  NFSD: simplify struct nfsfh
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/nfs4xdr.c
Simple merge

diff --cc fs/nfsd/nfsctl.c
Simple merge

diff --cc include/trace/events/rpcrdma.h
Simple merge

diff --cc include/trace/events/sunrpc.h
index dc922e6648204c4affc883ee7e7384f39700414a,9ea59959a2fe551ef6645b95993ffc59cd092f86..3a99358c262b4cd2d895e13cd4fc8bb1a2665272
--- 1/include/trace/events/sunrpc.h
--- 2/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@@ -80,11 -80,12 +82,13 @@@ DECLARE_EVENT_CLASS(rpc_xdr_buf_class
                __entry->msg_len = xdr->len;
        ),
  
 -      TP_printk("task:%u@%u head=[%p,%zu] page=%u(%u) tail=[%p,%zu] len=%u",
 +      TP_printk(SUNRPC_TRACE_TASK_SPECIFIER
-                 " head=[%p,%zu] page=%u tail=[%p,%zu] len=%u",
++                " head=[%p,%zu] page=%u(%u) tail=[%p,%zu] len=%u",
                __entry->task_id, __entry->client_id,
-               __entry->head_base, __entry->head_len, __entry->page_len,
-               __entry->tail_base, __entry->tail_len, __entry->msg_len
+               __entry->head_base, __entry->head_len,
+               __entry->page_len, __entry->page_base,
+               __entry->tail_base, __entry->tail_len,
+               __entry->msg_len
        )
  );
  

diff --cc net/sunrpc/auth_gss/svcauth_gss.c
Simple merge