From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:37462 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751979AbbIZG1H (ORCPT ); Sat, 26 Sep 2015 02:27:07 -0400 Subject: Patch "SUNRPC: Fix a thinko in xs_connect()" has been added to the 4.2-stable tree To: trond.myklebust@primarydata.com, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 25 Sep 2015 20:55:53 -0700 Message-ID: <1443239753232218@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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.2-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.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 99b1a4c32ad22024ac6198a4337aaec5ea23168f Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 13 Aug 2015 15:33:51 -0400 Subject: SUNRPC: Fix a thinko in xs_connect() From: Trond Myklebust 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. Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/xprtsock.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2279,13 +2279,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 trond.myklebust@primarydata.com are queue-4.2/nfs41-flexfiles-zero-out-ds-write-wcc.patch queue-4.2/nfs-nfs_set_pgio_error-sometimes-misses-errors.patch queue-4.2/nfs-fix-a-null-pointer-dereference-of-migration-recovery-ops-for-v4.2-client.patch queue-4.2/sunrpc-xs_reset_transport-must-mark-the-connection-as-disconnected.patch queue-4.2/nfs-fix-truncated-client-owner-id-without-proto-type.patch queue-4.2/nfs-don-t-let-the-ctime-override-attribute-barriers.patch queue-4.2/sunrpc-fix-a-thinko-in-xs_connect.patch queue-4.2/nfsv4-don-t-set-setattr-for-o_rdonly-o_excl.patch queue-4.2/nfs41-flexfiles-update-inode-after-write-finishes.patch queue-4.2/nfsv4.1-pnfs-fix-borken-function-_same_data_server_addrs_locked.patch queue-4.2/nfsv4-force-a-post-op-attribute-update-when-holding-a-delegation.patch queue-4.2/nfsv4.1-pnfs-fix-atomicity-of-commit-list-updates.patch queue-4.2/nfsv4.1-flexfiles-fix-a-protocol-error-in-layoutreturn.patch queue-4.2/revert-nfsv4-remove-incorrect-check-in-can_open_delegated.patch queue-4.2/nfsv4.1-fix-a-protocol-issue-with-close-stateids.patch