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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3692CCA480 for ; Mon, 13 Jun 2022 11:21:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352791AbiFMLUk (ORCPT ); Mon, 13 Jun 2022 07:20:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353189AbiFMLTP (ORCPT ); Mon, 13 Jun 2022 07:19:15 -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 7F7283A5E0; Mon, 13 Jun 2022 03:41:05 -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 0273FB80EA3; Mon, 13 Jun 2022 10:41:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55170C34114; Mon, 13 Jun 2022 10:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655116862; bh=AklaX1ZjOpwibdDKIcs/+NV5T8qhW/NEYtOqgijoN+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qgsk/dWjaRTpbD71TK/vymZWHxv7x/pLD+ZYsSDlWyt2Fky1wObgHIEKrzzNYnm+G 0j+LW8VLc/2D9kSn569uQfDGYqBVFusVobHFBvLLEmemrr01vvGHVPCKI108PlSNQg a/7LnFwfxheoGDCuD8SqJJ5FDfjDs4uMSZIT+BXc= 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.4 200/411] NFS: Do not report EINTR/ERESTARTSYS as mapping errors Date: Mon, 13 Jun 2022 12:07:53 +0200 Message-Id: <20220613094934.657282191@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094928.482772422@linuxfoundation.org> References: <20220613094928.482772422@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Trond Myklebust [ Upstream commit cea9ba7239dcc84175041174304c6cdeae3226e5 ] If the attempt to flush data was interrupted due to a local signal, then just requeue the writes back for I/O. Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 30d8e7bc1cef..ecdd79a55840 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1429,7 +1429,7 @@ static void nfs_async_write_error(struct list_head *head, int error) while (!list_empty(head)) { req = nfs_list_entry(head->next); nfs_list_remove_request(req); - if (nfs_error_is_fatal(error)) + if (nfs_error_is_fatal_on_server(error)) nfs_write_error(req, error); else nfs_redirty_request(req); -- 2.35.1