From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jul 2019 21:32:33 +0000 (-0700)
Subject: Merge tag 'nfs-for-5.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6860c981b9672324cb53b883cfda8d2ea1445ff1;p=linux.git

Merge tag 'nfs-for-5.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates from Trond Myklebust:
 "Highlights include:

  Stable fixes:

   - SUNRPC: Ensure bvecs are re-synced when we re-encode the RPC
     request

   - Fix an Oops in ff_layout_track_ds_error due to a PTR_ERR()
     dereference

   - Revert buggy NFS readdirplus optimisation

   - NFSv4: Handle the special Linux file open access mode

   - pnfs: Fix a problem where we gratuitously start doing I/O through
     the MDS

  Features:

   - Allow NFS client to set up multiple TCP connections to the server
     using a new 'nconnect=X' mount option. Queue length is used to
     balance load.

   - Enhance statistics reporting to report on all transports when using
     multiple connections.

   - Speed up SUNRPC by removing bh-safe spinlocks

   - Add a mechanism to allow NFSv4 to request that containers set a
     unique per-host identifier for when the hostname is not set.

   - Ensure NFSv4 updates the lease_time after a clientid update

  Bugfixes and cleanup:

   - Fix use-after-free in rpcrdma_post_recvs

   - Fix a memory leak when nfs_match_client() is interrupted

   - Fix buggy file access checking in NFSv4 open for execute

   - disable unsupported client side deduplication

   - Fix spurious client disconnections

   - Fix occasional RDMA transport deadlock

   - Various RDMA cleanups

   - Various tracepoint fixes

   - Fix the TCP callback channel to guarantee the server can actually
     send the number of callback requests that was negotiated at mount
     time"

* tag 'nfs-for-5.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (68 commits)
  pnfs/flexfiles: Add tracepoints for detecting pnfs fallback to MDS
  pnfs: Fix a problem where we gratuitously start doing I/O through the MDS
  SUNRPC: Optimise transport balancing code
  SUNRPC: Ensure the bvecs are reset when we re-encode the RPC request
  pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error
  NFSv4: Don't use the zero stateid with layoutget
  SUNRPC: Fix up backchannel slot table accounting
  SUNRPC: Fix initialisation of struct rpc_xprt_switch
  SUNRPC: Skip zero-refcount transports
  SUNRPC: Replace division by multiplication in calculation of queue length
  NFSv4: Validate the stateid before applying it to state recovery
  nfs4.0: Refetch lease_time after clientid update
  nfs4: Rename nfs41_setup_state_renewal
  nfs4: Make nfs4_proc_get_lease_time available for nfs4.0
  nfs: Fix copy-and-paste error in debug message
  NFS: Replace 16 seq_printf() calls by seq_puts()
  NFS: Use seq_putc() in nfs_show_stats()
  Revert "NFS: readdirplus optimization by cache mechanism" (memleak)
  SUNRPC: Fix transport accounting when caller specifies an rpc_xprt
  NFS: Record task, client ID, and XID in xdr_status trace points
  ...
---

6860c981b9672324cb53b883cfda8d2ea1445ff1
diff --cc net/sunrpc/debugfs.c
index 707d7aab15466,105bea190a45b..fd9bca2427242
--- a/net/sunrpc/debugfs.c
+++ b/net/sunrpc/debugfs.c
@@@ -117,44 -118,64 +117,50 @@@ static const struct file_operations tas
  	.release	= tasks_release,
  };
  
+ static int do_xprt_debugfs(struct rpc_clnt *clnt, struct rpc_xprt *xprt, void *numv)
+ {
+ 	int len;
+ 	char name[24]; /* enough for "../../rpc_xprt/ + 8 hex digits + NULL */
+ 	char link[9]; /* enough for 8 hex digits + NULL */
+ 	int *nump = numv;
+ 
+ 	if (IS_ERR_OR_NULL(xprt->debugfs))
+ 		return 0;
+ 	len = snprintf(name, sizeof(name), "../../rpc_xprt/%s",
+ 		       xprt->debugfs->d_name.name);
+ 	if (len > sizeof(name))
+ 		return -1;
+ 	if (*nump == 0)
+ 		strcpy(link, "xprt");
+ 	else {
+ 		len = snprintf(link, sizeof(link), "xprt%d", *nump);
+ 		if (len > sizeof(link))
+ 			return -1;
+ 	}
 -	if (!debugfs_create_symlink(link, clnt->cl_debugfs, name))
 -		return -1;
++	debugfs_create_symlink(link, clnt->cl_debugfs, name);
+ 	(*nump)++;
+ 	return 0;
+ }
+ 
  void
  rpc_clnt_debugfs_register(struct rpc_clnt *clnt)
  {
  	int len;
- 	char name[24]; /* enough for "../../rpc_xprt/ + 8 hex digits + NULL */
- 	struct rpc_xprt *xprt;
+ 	char name[9]; /* enough for 8 hex digits + NULL */
+ 	int xprtnum = 0;
  
 -	/* Already registered? */
 -	if (clnt->cl_debugfs || !rpc_clnt_dir)
 -		return;
 -
  	len = snprintf(name, sizeof(name), "%x", clnt->cl_clid);
  	if (len >= sizeof(name))
  		return;
  
  	/* make the per-client dir */
  	clnt->cl_debugfs = debugfs_create_dir(name, rpc_clnt_dir);
 -	if (!clnt->cl_debugfs)
 -		return;
  
  	/* make tasks file */
 -	if (!debugfs_create_file("tasks", S_IFREG | 0400, clnt->cl_debugfs,
 -				 clnt, &tasks_fops))
 -		goto out_err;
 +	debugfs_create_file("tasks", S_IFREG | 0400, clnt->cl_debugfs, clnt,
 +			    &tasks_fops);
  
- 	rcu_read_lock();
- 	xprt = rcu_dereference(clnt->cl_xprt);
- 	/* no "debugfs" dentry? Don't bother with the symlink. */
- 	if (IS_ERR_OR_NULL(xprt->debugfs)) {
- 		rcu_read_unlock();
- 		return;
- 	}
- 	len = snprintf(name, sizeof(name), "../../rpc_xprt/%s",
- 			xprt->debugfs->d_name.name);
- 	rcu_read_unlock();
- 
- 	if (len >= sizeof(name))
 -	if (rpc_clnt_iterate_for_each_xprt(clnt, do_xprt_debugfs, &xprtnum) < 0)
--		goto out_err;
- 
- 	debugfs_create_symlink("xprt", clnt->cl_debugfs, name);
--
--	return;
--out_err:
--	debugfs_remove_recursive(clnt->cl_debugfs);
--	clnt->cl_debugfs = NULL;
++	rpc_clnt_iterate_for_each_xprt(clnt, do_xprt_debugfs, &xprtnum);
  }
  
  void