From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jul 2015 18:32:23 +0000 (-0700)
Subject: Merge tag 'nfs-for-4.2-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8688d9540cc6e17df4cba71615e27f04e0378fe6;p=openwrt%2Fstaging%2Fblogic.git

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

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

  Stable patches:
   - Fix a crash in the NFSv4 file locking code.
   - Fix an fsync() regression, where we were failing to retry I/O in
     some circumstances.
   - Fix an infinite loop in NFSv4.0 OPEN stateid recovery
   - Fix a memory leak when an attempted pnfs fails.
   - Fix a memory leak in the backchannel code
   - Large hostnames were not supported correctly in NFSv4.1
   - Fix a pNFS/flexfiles bug that was impeding error reporting on I/O.
   - Fix a couple of credential issues in pNFS/flexfiles

  Bugfixes + cleanups:
   - Open flag sanity checks in the NFSv4 atomic open codepath
   - More NFSv4 delegation related bugfixes
   - Various NFSv4.1 backchannel bugfixes and cleanups
   - Fix the NFS swap socket code
   - Various cleanups of the NFSv4 SETCLIENTID and EXCHANGE_ID code
   - Fix a UDP transport deadlock issue

  Features:
   - More RDMA client transport improvements
   - NFSv4.2 LAYOUTSTATS functionality for pnfs flexfiles"

* tag 'nfs-for-4.2-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (87 commits)
  nfs: Remove invalid tk_pid from debug message
  nfs: Remove invalid NFS_ATTR_FATTR_V4_REFERRAL checking in nfs4_get_rootfh
  nfs: Drop bad comment in nfs41_walk_client_list()
  nfs: Remove unneeded micro checking of CONFIG_PROC_FS
  nfs: Don't setting FILE_CREATED flags always
  nfs: Use remove_proc_subtree() instead remove_proc_entry()
  nfs: Remove unused argument in nfs_server_set_fsinfo()
  nfs: Fix a memory leak when meeting an unsupported state protect
  nfs: take extra reference to fl->fl_file when running a LOCKU operation
  NFSv4: When returning a delegation, don't reclaim an incompatible open mode.
  NFSv4.2: LAYOUTSTATS is optional to implement
  NFSv4.2: Fix up a decoding error in layoutstats
  pNFS/flexfiles: Fix the reset of struct pgio_header when resending
  pNFS/flexfiles: Turn off layoutcommit for servers that don't need it
  pnfs/flexfiles: protect ktime manipulation with mirror lock
  nfs: provide pnfs_report_layoutstat when NFS42 is disabled
  nfs: verify open flags before allowing open
  nfs: always update creds in mirror, even when we have an already connected ds
  nfs: fix potential credential leak in ff_layout_update_mirror_cred
  pnfs/flexfiles: report layoutstat regularly
  ...
---

8688d9540cc6e17df4cba71615e27f04e0378fe6
diff --cc net/sunrpc/xprtrdma/frwr_ops.c
index d234521320a4,661fbc1784ab..04ea914201b2
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@@ -128,8 -252,8 +252,8 @@@ frwr_sendcompletion(struct ib_wc *wc
  
  	/* WARNING: Only wr_id and status are reliable at this point */
  	r = (struct rpcrdma_mw *)(unsigned long)wc->wr_id;
- 	dprintk("RPC:       %s: frmr %p (stale), status %s (%d)\n",
 -	pr_warn("RPC:       %s: frmr %p flushed, status %d\n",
 -		__func__, r, wc->status);
++	pr_warn("RPC:       %s: frmr %p flushed, status %s (%d)\n",
 +		__func__, r, ib_wc_status_msg(wc->status), wc->status);
  	r->r.frmr.fr_state = FRMR_IS_STALE;
  }
  
diff --cc net/sunrpc/xprtrdma/transport.c
index 436da2caec95,9facc71d9d86..680f888a9ddd
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@@ -720,9 -744,11 +738,11 @@@ void xprt_rdma_cleanup(void
  	if (rc)
  		dprintk("RPC:       %s: xprt_unregister returned %i\n",
  			__func__, rc);
+ 
+ 	frwr_destroy_recovery_wq();
  }
  
 -static int __init xprt_rdma_init(void)
 +int xprt_rdma_init(void)
  {
  	int rc;
  
diff --cc net/sunrpc/xprtrdma/verbs.c
index 52df265b472a,234083560d0e..891c4ede2c20
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@@ -692,9 -763,9 +684,9 @@@ rpcrdma_ep_create(struct rpcrdma_ep *ep
  	init_waitqueue_head(&ep->rep_connect_wait);
  	INIT_DELAYED_WORK(&ep->rep_connect_worker, rpcrdma_connect_worker);
  
 +	cq_attr.cqe = ep->rep_attr.cap.max_send_wr + 1;
- 	sendcq = ib_create_cq(ia->ri_id->device, rpcrdma_sendcq_upcall,
- 				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
+ 	sendcq = ib_create_cq(ia->ri_device, rpcrdma_sendcq_upcall,
 -			      rpcrdma_cq_async_error_upcall, ep,
 -			      ep->rep_attr.cap.max_send_wr + 1, 0);
++			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
  	if (IS_ERR(sendcq)) {
  		rc = PTR_ERR(sendcq);
  		dprintk("RPC:       %s: failed to create send CQ: %i\n",
@@@ -709,9 -780,9 +701,9 @@@
  		goto out2;
  	}
  
 +	cq_attr.cqe = ep->rep_attr.cap.max_recv_wr + 1;
- 	recvcq = ib_create_cq(ia->ri_id->device, rpcrdma_recvcq_upcall,
- 				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
+ 	recvcq = ib_create_cq(ia->ri_device, rpcrdma_recvcq_upcall,
 -			      rpcrdma_cq_async_error_upcall, ep,
 -			      ep->rep_attr.cap.max_recv_wr + 1, 0);
++			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
  	if (IS_ERR(recvcq)) {
  		rc = PTR_ERR(recvcq);
  		dprintk("RPC:       %s: failed to create recv CQ: %i\n",