Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp5865571rdb; Sun, 17 Sep 2023 16:38:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG71R73nZnlfHiHh2xHqtgnhRBVzdoZEQFT5U78WLSlAD3bUNR16ocL3IpRjOMEqV6ji7G8 X-Received: by 2002:a05:6a20:4409:b0:159:f5fb:bf8f with SMTP id ce9-20020a056a20440900b00159f5fbbf8fmr7857400pzb.48.1694993890571; Sun, 17 Sep 2023 16:38:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694993890; cv=none; d=google.com; s=arc-20160816; b=DXPnZ5ylJhzhDp3m9gwdPl5Kur7I5ehoRJhjzTYBcIpCrVJZo8E2tlOgrwLFheumTT dKgxvLmbfoF4FFwwKCPdi0CS7F9BRlPvEQIskZ79z+dcwljKEFx6+jpvV1uWDdZVoRJ8 82mKUzNisQTT6E9vQD67HOu/551wZaB75Cj0SrJ2SBhifz2mtTBPTfnQdF0t2wH9ZM2l Iuh4OrSwcDsZsKMF7OSnx1MTSND2nDC1CtQKDojtYwm6aHtmB7aYdkIzmFKPSzUlRKUn AGmo0S8ToktaEeaLj48ZWKEH7o3dNHhlwz/Ya6vvYziBY9CZOvf11qvJXzKDIzHpZgBW qZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xfLyiBNvml/m59UVUpfojDQr3Kkt35wTusslcghGlB8=; fh=aLZd2bH2OhTwPpi3KZQeo+2VBDoRXxWGQA9LCIOUdAM=; b=PISK8ETj8GusZ3HYxVwhF5WnDci063/CcrEr5MKTM8u41nd1AUJnzs3C4D01DTCqum J22lEVSAouH83n5COvIjTJwaxcjV3Cqz442xQ+zXWzwCcnePV2ovUo9/hm241BV+oeg1 +HooCWzjXwrYK/mHogGpJM4BBedA127qldLSbR3P1e8wk/i8GyZiyFF4FWpFB/7n6hxT PtaZu7vTQs7FGbgkDoQlRT62tG+b+MukxBNZSp6QYKNFJKqFjGPDfzcatoF70HY4gfoO BlD804ec0+z4+EK4f9fMfWSX19NyPWPOlGu8/H++ohmpLJuw8+yus5x/W01JzjkHQA3Z c+SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JRksyBGY; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id bx32-20020a056a02052000b00565f2d55050si7422786pgb.737.2023.09.17.16.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 16:38:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JRksyBGY; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 3CB3C804B28C; Sun, 17 Sep 2023 16:37:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230346AbjIQXd7 (ORCPT + 99 others); Sun, 17 Sep 2023 19:33:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232295AbjIQXdj (ORCPT ); Sun, 17 Sep 2023 19:33:39 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D31B3122 for ; Sun, 17 Sep 2023 16:33:34 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9C7BC433C8; Sun, 17 Sep 2023 23:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694993614; bh=9ZW/1zUqL4NYZxB0sxs6I1ioG0W8uf6Z8Kd2Zt0K4gA=; h=From:To:Cc:Subject:Date:From; b=JRksyBGYlVS+QigMIYvhnmtKW7fWAMHxNj6nv8WrqPxZiCoZbDkhZtglsqGCYyybM msvkrlUUOCiZeOVLADqXmRs71yfwQECwFyerOqD6Ff+bD3E1RTDVRQCJ3gmIaN+b7I 4PHEK8lpgOVr1QQ3dUsdoDTZalYkHqLWR7AREzYjPkFpvSq8ngWfghRZe0sx8WAx86 tQslonGJks1venugYXow4NbnEzVoRWyNrbLo5JmmUbDF3SVFmuknWlYdp28GyzXLl0 fFB5RBgBRTP9Ynv78Emwxdl2thmC7rkRMY/mw41vTplVUFe70RXsuWPmpLdGAkqtiB pJl7gZ6qbR9wQ== From: trondmy@kernel.org To: Anna Schumaker Cc: linux-nfs@vger.kernel.org, Olga Kornievskaia Subject: [PATCH] Revert "SUNRPC dont update timeout value on connection reset" Date: Sun, 17 Sep 2023 19:26:46 -0400 Message-ID: <20230917232646.30810-1-trondmy@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 17 Sep 2023 16:37:43 -0700 (PDT) From: Trond Myklebust This reverts commit 88428cc4ae7abcc879295fbb19373dd76aad2bdd. The problem this commit is intended to fix was comprehensively fixed in commit 7de62bc09fe6 ("SUNRPC dont update timeout value on connection reset"). Since then, this commit has been preventing the correct timeout of soft mounted requests. Cc: stable@vger.kernel.org # 5.9.x: 09252177d5f9: SUNRPC: Handle major timeout in xprt_adjust_timeout() Cc: stable@vger.kernel.org # 5.9.x: 7de62bc09fe6: SUNRPC dont update timeout value on connection reset Cc: stable@vger.kernel.org # 5.9.x Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 5a7de7e55548..7f533c1041a4 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2476,8 +2476,7 @@ call_status(struct rpc_task *task) goto out_exit; } task->tk_action = call_encode; - if (status != -ECONNRESET && status != -ECONNABORTED) - rpc_check_timeout(task); + rpc_check_timeout(task); return; out_exit: rpc_call_rpcerror(task, status); -- 2.41.0