From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E3E1C43381 for ; Fri, 22 Mar 2019 12:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D17792075E for ; Fri, 22 Mar 2019 12:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553259546; bh=yWX0z647Elf0qJE7ygEPl6ADwcfm+V8AdhfbMTCDcbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g5LVrwxYbeWzt/0Jn6Zxk9hnjHRG7GMRiIpcSgW8fAJj6SQ2Xwvucx2Kek8ZRxzst XlduU41nysRIv+J+76fCakql01npaKotsjN/JrN8cJ5W+PqSYYWjc8VVS9xkn/+AWy u24hfrvDOcaLmyMo2iAz+hqL7LhL169nQI6d0kx4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731779AbfCVLpr (ORCPT ); Fri, 22 Mar 2019 07:45:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:48896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731799AbfCVLpq (ORCPT ); Fri, 22 Mar 2019 07:45:46 -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 A0941218B0; Fri, 22 Mar 2019 11:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255146; bh=yWX0z647Elf0qJE7ygEPl6ADwcfm+V8AdhfbMTCDcbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WtZXayQ+E7GmduvNbcXfmsfFy0ochyeIogiMsZv07g04P4RpukfvyxE0ig6PSlJxb Zi7yjyEruEUIfsyzxOCUBDNjQAbNlHTyDaiULpNlcNrL/WibzQTMMerqBlYnsyFqjY rRIYDY0eCPQYYV+yKmAeaqB9sw2POkoha90F/kP4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust Subject: [PATCH 4.9 103/118] NFS: Dont recoalesce on error in nfs_pageio_complete_mirror() Date: Fri, 22 Mar 2019 12:16:15 +0100 Message-Id: <20190322111223.634640035@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111215.873964544@linuxfoundation.org> References: <20190322111215.873964544@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Trond Myklebust commit 8127d82705998568b52ac724e28e00941538083d upstream. If the I/O completion failed with a fatal error, then we should just exit nfs_pageio_complete_mirror() rather than try to recoalesce. Fixes: a7d42ddb3099 ("nfs: add mirroring support to pgio layer") Signed-off-by: Trond Myklebust Cc: stable@vger.kernel.org # v4.0+ Signed-off-by: Greg Kroah-Hartman --- fs/nfs/pagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -1200,7 +1200,7 @@ static void nfs_pageio_complete_mirror(s desc->pg_mirror_idx = mirror_idx; for (;;) { nfs_pageio_doio(desc); - if (!mirror->pg_recoalesce) + if (desc->pg_error < 0 || !mirror->pg_recoalesce) break; if (!nfs_do_recoalesce(desc)) break;