From patchwork Sat Aug 29 20:39:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7095731 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6EDDFBEEC1 for ; Sat, 29 Aug 2015 20:39:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92A682083B for ; Sat, 29 Aug 2015 20:39:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79CAF20838 for ; Sat, 29 Aug 2015 20:39:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752326AbbH2UjF (ORCPT ); Sat, 29 Aug 2015 16:39:05 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34258 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbbH2UjE (ORCPT ); Sat, 29 Aug 2015 16:39:04 -0400 Received: by pabzx8 with SMTP id zx8so96734031pab.1 for ; Sat, 29 Aug 2015 13:39:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=SJqbRL91SPSuv1/4v5kDikju8+gajbAFmXK45yws09o=; b=Lxbyd7bu4rocMNLGy0nUz44UuI3Nc4kzXmLxWdk8l+FOMwEFH+R0URB8wWvpkwscNy kEtuKveo2c5fVs2J7AXZkL/D25Nl7aZuvEf5WmBgnSJnMuSqcfbZKmMu8UMioGa7C6y6 Iu4S+KtHZTog0+2LIF+BIyDEZg9rL5bnsuCxS16TueUtQaBu6Www5OC+gS3snQ0mLrvS w1xJ8LrRq5FvL9qx8EvFJInkb9WRXyfMFgw+GrCnzYfxDwgPV43qpzPhMEEO3KEivXQl CEEcZkRU+wkHT8WhBtEAOmV/DIRMJJuomRnE6KPGv9hqmbLYTmEwcKkO83d9JQNl/fuY lzZA== X-Gm-Message-State: ALoCoQkvhswVghswTyNCBqhVry5/jxFAxfO3zlbMxCQWLz/ncKa1d1xkew4kH4PJkEbGdbUePcm7 X-Received: by 10.66.66.202 with SMTP id h10mr24278450pat.145.1440880743485; Sat, 29 Aug 2015 13:39:03 -0700 (PDT) Received: from leira.trondhjem.org.localdomain ([216.2.50.205]) by smtp.gmail.com with ESMTPSA id i8sm3039708pbq.31.2015.08.29.13.39.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Aug 2015 13:39:02 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH] SUNRPC: xs_reset_transport must mark the connection as disconnected Date: Sat, 29 Aug 2015 13:39:01 -0700 Message-Id: <1440880741-6670-1-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.4.3 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case the reconnection attempt fails. Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 3dd7c7951254..e738ceb6b2ed 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -829,6 +829,7 @@ static void xs_reset_transport(struct sock_xprt *transport) sk->sk_user_data = NULL; xs_restore_old_callbacks(transport, sk); + xprt_clear_connected(xprt); write_unlock_bh(&sk->sk_callback_lock); xs_sock_reset_connection_flags(xprt);