Patch "SUNRPC: Fix a thinko in xs_connect()" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

SUNRPC: Fix a thinko in xs_connect()

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sunrpc-fix-a-thinko-in-xs_connect.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Trond Myklebust <[email protected]>
Date: Thu, 13 Aug 2015 15:33:51 -0400
Subject: SUNRPC: Fix a thinko in xs_connect()

From: Trond Myklebust <[email protected]>

commit 99b1a4c32ad22024ac6198a4337aaec5ea23168f upstream.

It is rather pointless to test the value of transport->inet after calling xs_reset_transport(), since it will always be zero, and so we will never see any exponential back off behaviour. Also don't force early connections for SOFTCONN tasks. If the server disconnects us, we should respect the exponential backoff.

---
 net/sunrpc/xprtsock.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

@@ -2216,13 +2216,14 @@ static void xs_connect(struct rpc_xprt *
 
 	WARN_ON_ONCE(!xprt_lock_connect(xprt, task, transport));
 
-	/* Start by resetting any existing state */
-	xs_reset_transport(transport);
-
-	if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
+	if (transport->sock != NULL) {
 		dprintk("RPC:       xs_connect delayed xprt %p for %lu "
 				"seconds\n",
 				xprt, xprt->reestablish_timeout / HZ);
+
+		/* Start by resetting any existing state */
+		xs_reset_transport(transport);
+
 		queue_delayed_work(rpciod_workqueue,
 				   &transport->connect_worker,
 				   xprt->reestablish_timeout);

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/nfs41-flexfiles-zero-out-ds-write-wcc.patch queue-4.1/nfs-nfs_set_pgio_error-sometimes-misses-errors.patch queue-4.1/nfs-fix-a-null-pointer-dereference-of-migration-recovery-ops-for-v4.2-client.patch queue-4.1/sunrpc-xs_reset_transport-must-mark-the-connection-as-disconnected.patch queue-4.1/nfs-don-t-let-the-ctime-override-attribute-barriers.patch queue-4.1/sunrpc-fix-a-thinko-in-xs_connect.patch queue-4.1/nfsv4-don-t-set-setattr-for-o_rdonly-o_excl.patch queue-4.1/nfs41-flexfiles-update-inode-after-write-finishes.patch queue-4.1/nfsv4.1-pnfs-fix-borken-function-_same_data_server_addrs_locked.patch queue-4.1/nfsv4-force-a-post-op-attribute-update-when-holding-a-delegation.patch queue-4.1/nfsv4-pnfs-ensure-we-don-t-miss-a-file-extension.patch queue-4.1/nfsv4.1-flexfiles-fix-a-protocol-error-in-layoutreturn.patch queue-4.1/revert-nfsv4-remove-incorrect-check-in-can_open_delegated.patch queue-4.1/nfsv4.1-fix-a-protocol-issue-with-close-stateids.patch