From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2020 17:33:13 +0000 (-0700)
Subject: Merge tag 'nfsd-5.8' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v5.10.7~2356
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c742b63473b3c5180db8b5d74fdbd56e4371dfa2;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull nfsd updates from Bruce Fields:
 "Highlights:

   - Keep nfsd clients from unnecessarily breaking their own
     delegations.

     Note this requires a small kthreadd addition. The result is Tejun
     Heo's suggestion (see link), and he was OK with this going through
     my tree.

   - Patch nfsd/clients/ to display filenames, and to fix byte-order
     when displaying stateid's.

   - fix a module loading/unloading bug, from Neil Brown.

   - A big series from Chuck Lever with RPC/RDMA and tracing
     improvements, and lay some groundwork for RPC-over-TLS"

Link: https://lore.kernel.org/r/1588348912-24781-1-git-send-email-bfields@redhat.com

* tag 'nfsd-5.8' of git://linux-nfs.org/~bfields/linux: (49 commits)
  sunrpc: use kmemdup_nul() in gssp_stringify()
  nfsd: safer handling of corrupted c_type
  nfsd4: make drc_slab global, not per-net
  SUNRPC: Remove unreachable error condition in rpcb_getport_async()
  nfsd: Fix svc_xprt refcnt leak when setup callback client failed
  sunrpc: clean up properly in gss_mech_unregister()
  sunrpc: svcauth_gss_register_pseudoflavor must reject duplicate registrations.
  sunrpc: check that domain table is empty at module unload.
  NFSD: Fix improperly-formatted Doxygen comments
  NFSD: Squash an annoying compiler warning
  SUNRPC: Clean up request deferral tracepoints
  NFSD: Add tracepoints for monitoring NFSD callbacks
  NFSD: Add tracepoints to the NFSD state management code
  NFSD: Add tracepoints to NFSD's duplicate reply cache
  SUNRPC: svc_show_status() macro should have enum definitions
  SUNRPC: Restructure svc_udp_recvfrom()
  SUNRPC: Refactor svc_recvfrom()
  SUNRPC: Clean up svc_release_skb() functions
  SUNRPC: Refactor recvfrom path dealing with incomplete TCP receives
  SUNRPC: Replace dprintk() call sites in TCP receive path
  ...
---

c742b63473b3c5180db8b5d74fdbd56e4371dfa2
diff --cc net/sunrpc/svcsock.c
index e7a0037,97d2b6f..5c4ec93
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@@ -1322,11 -1357,7 +1343,6 @@@ static struct svc_xprt *svc_create_sock
  	struct sockaddr *newsin = (struct sockaddr *)&addr;
  	int		newlen;
  	int		family;
- 	RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
- 
- 	dprintk("svc: svc_create_socket(%s, %d, %s)\n",
- 			serv->sv_program->pg_name, protocol,
- 			__svc_print_addr(sin, buf, sizeof(buf)));
 -	int		val;
  
  	if (protocol != IPPROTO_UDP && protocol != IPPROTO_TCP) {
  		printk(KERN_WARNING "svc: only UDP and TCP "