Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp2158286ybm; Thu, 23 May 2019 12:18:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwUVeYSPl3feeWQSl7IERBepHbjMkKuNOxM/S94q+QzKXkLu6oNYYHXeImqKDBr9MjkBx7R X-Received: by 2002:a17:902:7581:: with SMTP id j1mr16859025pll.23.1558639125306; Thu, 23 May 2019 12:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558639125; cv=none; d=google.com; s=arc-20160816; b=FMr2E2dpGV0FEC6t4DzmPPlnyHDSvXMTSajRykaHJGArhTCd7bwtbkkB/9U2aqjE+9 0fk9amcSQ63zp9CyYGTdOgjeHRH4x1EyeA62lDKdZNXH7WWsXk5+cai6vDgWQzS3u34f IacRXE1h/uDBL4ofbTkik3yY87hAOYlwpYB61sEVED+E/eqr+AGfUU+hdiLlMbhs9plV xyX8YUQz9vZiA0xG14pA6QHZdVHeQ2UFfzW7BerrdGHNbqYBYCl2SFyUwEALi1lDfjvo IxBkOqKFsRwMojMDoMWI09C9fbfkNb3S4I9ADP/7WvPAHhpFSO7i/OoDoLc52U18zaeG zpDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qKiyTAm5V0J7hWQitkz57xa5MFgq0QwsD8ashS3tz3g=; b=M9lb1YEilivoE54K5HGO75rj6QfaqzTpuo3itjFqmGXDnz20fYPzI9pyUAUKxbKID5 uzRCG22JE5BRMlK90MEIb/+mOzkAB248sRaI/BnamYpt0sNO/gLVRHrFdErP3+M8ZKFB G/rwMneeK8TapUR4++fpzqSakyDR5gmFTz6/eQb7ueQGQ03zBiPVn5EX5Wqq+/YuRmCY UWauiimX1qfxqq8oDnAdurVq6ukFlj1eNNHYVvMie1eXaXK8SJqJbpTLdvHn1LeX9yqr DvVHkrytIMJ+DxvgRFrGlcTr5QCjxyBJWUbSocN1Bq/90cXUD9EdVkgdJ3v1P1iOCUNi xVrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Zgv4tDx7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w7si521052ply.279.2019.05.23.12.18.13; Thu, 23 May 2019 12:18:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Zgv4tDx7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389199AbfEWTQc (ORCPT + 99 others); Thu, 23 May 2019 15:16:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:51178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389191AbfEWTQ3 (ORCPT ); Thu, 23 May 2019 15:16:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C54AC217D7; Thu, 23 May 2019 19:16:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638989; bh=ZKAWL+TfWyCxI4eR1wQK7z52Plma/GdthdPmEGtd6Z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zgv4tDx7f6P9t+DI8B19NeyPZwdPVR3uEyN1kf+xhOpTKLRdJKyZjL7SzB52Qqqlx i9+3GpHVvM4Htqk/qhJhNuk4ct1NeJoVogoMlIOFh5Jf2ZOGIRxC0f48YqzbI8ieTT HoFt49woYxtqpTMNhJ5cl229cv2U/tCb5kqN1UlY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Olga Kornievskaia , Anna Schumaker Subject: [PATCH 4.19 038/114] PNFS fallback to MDS if no deviceid found Date: Thu, 23 May 2019 21:05:37 +0200 Message-Id: <20190523181735.225066069@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181731.372074275@linuxfoundation.org> References: <20190523181731.372074275@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Olga Kornievskaia commit b1029c9bc078a6f1515f55dd993b507dcc7e3440 upstream. If we fail to find a good deviceid while trying to pnfs instead of propogating an error back fallback to doing IO to the MDS. Currently, code with fals the IO with EINVAL. Signed-off-by: Olga Kornievskaia Fixes: 8d40b0f14846f ("NFS filelayout:call GETDEVICEINFO after pnfs_layout_process completes" Cc: stable@vger.kernel.org # v4.11+ Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- fs/nfs/filelayout/filelayout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -904,7 +904,7 @@ fl_pnfs_update_layout(struct inode *ino, status = filelayout_check_deviceid(lo, fl, gfp_flags); if (status) { pnfs_put_lseg(lseg); - lseg = ERR_PTR(status); + lseg = NULL; } out: return lseg;