From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Nov 2021 00:45:54 +0000 (-0800)
Subject: Merge tag 'nfsd-5.16' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v6.6.17~8849
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38764c734028bf0ae4cf262f3eb7d965c86298bd;p=platform%2Fkernel%2Flinux-rpi.git

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
  ...
---

38764c734028bf0ae4cf262f3eb7d965c86298bd
diff --cc include/trace/events/sunrpc.h
index dc922e6,9ea5995..3a99358
--- a/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
  	)
  );