Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3325310rwa; Tue, 23 Aug 2022 02:53:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR7+14hphjRkkZnpuqIMpPt1sJAjpxpmlOOhbX3kxcFKJHd7rT+hKPqF9Mh8Aj6wluSm38DE X-Received: by 2002:a05:6402:1cab:b0:445:d67f:5323 with SMTP id cz11-20020a0564021cab00b00445d67f5323mr3032901edb.100.1661248395584; Tue, 23 Aug 2022 02:53:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661248395; cv=none; d=google.com; s=arc-20160816; b=HzmFJLQnIDCm+/E8PpysczFd5v4gD4WV6gqRXXPFRw1xjrxt6vllGGtryXcXeumbxh STkc+nSQycwe9po7r6ONB/oDUz9pgfK0h8IpFe0BGnUhOTIxml4CEcaGxXwASQoqWdak jYr/b13UDQLA6KC8+6ygKOgRbnnwDiXfmGtgeaTSHmDR3a7hdxMQTZVnMRw3eC8hijrd S1X6eUTCY1VaZ6gwsTtjzQ1kQwAb3qx+Zila60gyU/pVMdvJvpABE59pqgaGDJ8m3xGm Dd/HvtkrcX2+3WmS3UGNlKZzdGovI+b4Gog61zM9QBc/Xdt6oanKTBqq3kwOHsdpfm2e nDeQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9m3IUYteir/l6vR1Lq2msieZ3kpUxsruNvMCIUiu3fU=; b=ZISfYQ5jlNQ64q6T17yAIxW+QXZt2jl8YYnD7ife7bkn6Bh2xrlH1CtF79H0015zV3 w+ZySUlWhCFD0qSwodAO1Yix6w+iOtBUXRQ30Cynh1a2Qb5mqIhZVLtAcupk7mnb10Rz ctj+tAfoj2X0S/Q2OppO+a4QFFhPe0NkoUvNlgxicmWCpQYU1yyyGMq0qfRbQfxnhRbs Csica9ETMgvy8BPcGt6oJ9TWaQgzT/qcxU0OcYqJTEHyZCWHNiilDCqHoKxHqWcd+0Ti Vp0hHCS+euO7E2Zi9lfNHhN35rDpVe/D3padEHa1ej+Hw3tip3Kb+EYg6QygmVAdp0jU pmLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FIyGPL2N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s18-20020a50d492000000b00446817c6f14si1687620edi.197.2022.08.23.02.52.48; Tue, 23 Aug 2022 02:53:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FIyGPL2N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239383AbiHWIOd (ORCPT + 99 others); Tue, 23 Aug 2022 04:14:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242102AbiHWIKi (ORCPT ); Tue, 23 Aug 2022 04:10:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DBAD69F59; Tue, 23 Aug 2022 01:07:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1903CB81C19; Tue, 23 Aug 2022 08:07:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BE53C433D6; Tue, 23 Aug 2022 08:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661242064; bh=2FtPi5InGe8zR+ZqyxViScWdsfKTn2773GtUa3NxpfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FIyGPL2NDCHX1DuxUz+E3pQ0h4lyZua2b2tvXdTOrePM4vqRQcGpbfZswWrPkKktp ppCcSF06bfhFFrNalC+KgpwmDJqAaEtovSmK0B3B48qZFeVwNGB/y+M5iq+iVUySNo odSJvh+d0BDiiHPaK1tPah294qWRyKjTy6WzhkuM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust Subject: [PATCH 5.19 053/365] NFSv4.1: Handle NFS4ERR_DELAY replies to OP_SEQUENCE correctly Date: Tue, 23 Aug 2022 09:59:14 +0200 Message-Id: <20220823080120.412492864@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust commit 7ccafd4b2b9f34e6d8185f796f151c47424e273e upstream. Don't assume that the NFS4ERR_DELAY means that the server is processing this slot id. Fixes: 3453d5708b33 ("NFSv4.1: Avoid false retries when RPC calls are interrupted") Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/nfs4proc.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -853,7 +853,6 @@ static int nfs41_sequence_process(struct __func__, slot->slot_nr, slot->seq_nr); - nfs4_slot_sequence_acked(slot, slot->seq_nr); goto out_retry; case -NFS4ERR_RETRY_UNCACHED_REP: case -NFS4ERR_SEQ_FALSE_RETRY: