Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1623041iob; Sat, 14 May 2022 14:58:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZoO6wcpX6/Jdocvgh6gOIUYLACi6a+JcNouNW7rX/gghbmyR+pE9Ot8YNVY/H68Iqucsv X-Received: by 2002:a05:6000:2cf:b0:20c:58de:18c4 with SMTP id o15-20020a05600002cf00b0020c58de18c4mr8507213wry.530.1652565510505; Sat, 14 May 2022 14:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652565510; cv=none; d=google.com; s=arc-20160816; b=L08hWeW6c34IQDQMsIUGuXA9NDAhXINeIIzlJZdKYheLNQAxDgOrCWymBst2H7jhbc jG4ck+8U/x6eKiDI2dbZ+RhqiXeIOua4mbKVVpn45r83WXCwRDTZzba43Ek2IDLmkFNi FAAlT/usFRmO/1zQd3ZcENuOJexPwO+ew2VS+TQumS6Lkf+RYj611/Lgd1pYPRAsS3eA 9pW4hhl6wu4IjGpVrPJRLwdoEVd1AVMpx0Bjr67F9MJmhiYjoNHHqjsnsPYaxHLJCL/D S6M5SveKfZBZOn2+edCDlWhTl5nAxnmtvnPmYnE4jNDnz2m7mkw3ty9TudelPwTBqlMV bA6Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=n4Jawh/X6Xk5hJywUCvZs6U7E7GpOGPf11esfr+8wek=; b=puu+cp9KnFZ7o9e9AplD0F3fZrePUh6SH2CWO8tlqZCHOEipUZ8w9Tg7OSBxqCJhVv Xp6C3ufo6dOYm2T8Wpr/Xay2AkruRNWGWW+/2LXMlmQw3uJAaNKtRms04HJuVLNIuHmq uJt/Wr23wb4OA8kHcjFPBY2Ydf+FLWNGwjStUUSI2nHHYirY3ZkAqJv2zvdDiFRNSuOf OuXhllLJe8XTU6yuVdZeLBsniK4TWrgv+vVI9Bh+5cX3jH7U+jIFyWY+E6gMek8gPAhk IT/ddweZNuA/7uhGKwf4ci6iRCsVl2GCDWI7Vh3a88BKlgmeq4vhO8JDkOoUymbP0DX9 ZD0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D6dR8RDj; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l4-20020a5d4104000000b0020c46f9cc94si5100961wrp.793.2022.05.14.14.58.04; Sat, 14 May 2022 14:58:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-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=@kernel.org header.s=k20201202 header.b=D6dR8RDj; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233002AbiENOOc (ORCPT + 99 others); Sat, 14 May 2022 10:14:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233001AbiENOOY (ORCPT ); Sat, 14 May 2022 10:14:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D5581581B for ; Sat, 14 May 2022 07:14:24 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D444F60EDA for ; Sat, 14 May 2022 14:14:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED6E4C34116; Sat, 14 May 2022 14:14:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652537663; bh=ReQRCdjwjHc9eKaBs4b8uOavUQqFl0e0QuDHT3nVK7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D6dR8RDjhjBlhWXwjzqwPA4oQ5w6jH+lDorphTejbriPYKlJCn1JPqK+yBbhK8TI1 MZk08MV3v6RklYN0Yu0f5VAbZKptwYtkKJMIUrQsnRYt5VjhRmcGZIOP+jIpLH7mwE zFF9x/aGD73yoglVsi3vlnQ3EEibsJafOBLW0csMfm2ai5uLMpvkCm4ERl9ytWAOhv DC4Nbo3vi41PoJy2w02ElYs1rezjby0rsrHIV6k36vJHrK9ghtsrRXPPxzCVKFIukl bu2qXebqXQVQ5am26SdLv6j/zmoEYpB/8ruYMony1oc1a7wmFhB+5hhHC0AZeEeiQ3 0oFe3o+FnNFSw== From: trondmy@kernel.org To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH 4/5] pNFS/files: Fall back to I/O through the MDS on non-fatal layout errors Date: Sat, 14 May 2022 10:08:13 -0400 Message-Id: <20220514140814.3655-4-trondmy@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220514140814.3655-3-trondmy@kernel.org> References: <20220514140814.3655-1-trondmy@kernel.org> <20220514140814.3655-2-trondmy@kernel.org> <20220514140814.3655-3-trondmy@kernel.org> MIME-Version: 1.0 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-nfs@vger.kernel.org From: Trond Myklebust Only report the error when the server is returning a fatal error, such as ESTALE, EIO, etc... Signed-off-by: Trond Myklebust --- fs/nfs/filelayout/filelayout.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index 76deddab0a8f..2b2661582bbe 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -839,7 +839,12 @@ fl_pnfs_update_layout(struct inode *ino, lseg = pnfs_update_layout(ino, ctx, pos, count, iomode, strict_iomode, gfp_flags); - if (IS_ERR_OR_NULL(lseg)) + if (IS_ERR(lseg)) { + /* Fall back to MDS on recoverable errors */ + if (!nfs_error_is_fatal_on_server(PTR_ERR(lseg))) + lseg = NULL; + goto out; + } else if (!lseg) goto out; lo = NFS_I(ino)->layout; -- 2.36.1