Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2930114iog; Mon, 20 Jun 2022 07:42:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uXa27sE8b1cEU+ok+t/JO8fomKBUigsfsBr9JCv6aS5M+/JKhEZ0dewTRpxmKNcVIaQDvs X-Received: by 2002:a17:902:d151:b0:16a:13c6:69c8 with SMTP id t17-20020a170902d15100b0016a13c669c8mr11448174plt.116.1655736176000; Mon, 20 Jun 2022 07:42:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655736175; cv=none; d=google.com; s=arc-20160816; b=eqj+amjaWedyE44LX7GMmWE4NSIgooe2WkfkmOGYyWDgfSwUrACLMUUkb8wjoHLcpH hSLmBU2fEHzf9yJLOrD4gLKik5WTVF2xXqdJmd6LW/m/q2uAZiWdmKVy96MHsMUv7VYL zD+7OnvjXtX7WGCx95uRDNVfl/vf/Or/S/TkkN4KCOqL/9rb3Q0jxWPipSlft8kMt7la KddAzxiFy/BHrwerk1r5oo2Zlzb6PF6H6XmoyRtIz5pW5+sehCV+Pe3Num6z7lvzXuBT CQgcuFIK4eEF6GKhIZd85yEqSkh5aVfb7pWLzae2H05DBWHto/eCjBMME4k96s0X54c5 gFqg== 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=DATygUEH5sAXjKM8Vegjo7jlZC9lv14TKNrGruXdjhg=; b=OA1y2AnJxc+U3Vlb6CjOJpg/FrVNjeWOVlE0CXy/WsPbCEksNeCpLwicOzpXwY7JuG NKQYCbbpp5ZmXXFW8bz+GTPJzzxmyhDpwjzFerT0OAHca+M8pfz7tdgce/dnw6IypkZ7 T7ck8S+mtE2fsH3DZJ+QWqEljBQLRNPyZUg+JYGVyzaA3vhw4vuBeATcvQAIRH+0YgWU ZemzOh9gvTIGLZiI/0hBZTtloJZBDBBda7EAWhjsh9Bc7S1hLESUkXfMiF4gi+J0MM9p FmnEFDJZgmfWFq/jBtinmSr0k+2SkTOw2OA3QgfK7O8WewygOp3rXyLxxsf9yJ2+en2o HLrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Wdzty7E9; 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 s9-20020a17090b070900b001cbbd85faa9si18075117pjz.20.2022.06.20.07.42.43; Mon, 20 Jun 2022 07:42:55 -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=Wdzty7E9; 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 S1346756AbiFTNfl (ORCPT + 99 others); Mon, 20 Jun 2022 09:35:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346350AbiFTNcx (ORCPT ); Mon, 20 Jun 2022 09:32:53 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2509B2613F; Mon, 20 Jun 2022 06:12:45 -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 8B04EB811DA; Mon, 20 Jun 2022 13:06:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91F41C3411B; Mon, 20 Jun 2022 13:06:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655730418; bh=PkqkrDz7EiznkeuOMswvSLdRA7mpt5+yw/0olC7jZys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wdzty7E9sfmRMDs28IIvHnqCqk16qnm6oyMLabEQtu4HPhox0B2VVvCKlfkoTZS4e 6X1ms/SnZObXBAlzuUGtAi+8wGqYIuTBly9T1tsE+5joExJy2xv45C34etdKfA5MBL rMuYzQpu0I8uPgta1gIVWY5ImZr+1lumNtyU2Mr4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Anna Schumaker , Sasha Levin Subject: [PATCH 5.15 047/106] pNFS: Dont keep retrying if the server replied NFS4ERR_LAYOUTUNAVAILABLE Date: Mon, 20 Jun 2022 14:51:06 +0200 Message-Id: <20220620124725.781072299@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220620124724.380838401@linuxfoundation.org> References: <20220620124724.380838401@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 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 [ Upstream commit fe44fb23d6ccde4c914c44ef74ab8d9d9ba02bea ] If the server tells us that a pNFS layout is not available for a specific file, then we should not keep pounding it with further layoutget requests. Fixes: 183d9e7b112a ("pnfs: rework LAYOUTGET retry handling") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/pnfs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 1b4dd8b828de..9b2549222391 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -2152,6 +2152,12 @@ pnfs_update_layout(struct inode *ino, case -ERECALLCONFLICT: case -EAGAIN: break; + case -ENODATA: + /* The server returned NFS4ERR_LAYOUTUNAVAILABLE */ + pnfs_layout_set_fail_bit( + lo, pnfs_iomode_to_fail_bit(iomode)); + lseg = NULL; + goto out_put_layout_hdr; default: if (!nfs_error_is_fatal(PTR_ERR(lseg))) { pnfs_layout_clear_fail_bit(lo, pnfs_iomode_to_fail_bit(iomode)); -- 2.35.1