Received: by 2002:a05:6a10:144:0:0:0:0 with SMTP id 4csp1305186pxw; Sat, 9 Apr 2022 19:25:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWViwpDCkVB1QtacAUPyh4O8Bi7XweB3cl4BsHRCdlS8E737pxw6bxQEpRw3esO/B1O+IL X-Received: by 2002:a50:c00a:0:b0:418:f10f:b27c with SMTP id r10-20020a50c00a000000b00418f10fb27cmr26187233edb.204.1649557536422; Sat, 09 Apr 2022 19:25:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649557536; cv=none; d=google.com; s=arc-20160816; b=m2rkogCyYZD+UjfyHc53QYxTAiY5WWdIocyLCjghkQmKurgLmNoSBK8c/KZ3tyW1Lz X5mQRRmicLW6F2skXFfg0GCB6U5cGU21hYraxyv6UqO5yeHXVIqb0CPOVbvomyQv1YQF LqMuyVNMQwbFsEdh0xI5NuI0W+uhVcA31PIv1tfnayJV6QnJQFUq1wC/k5s0LeVdi66y 7eJ13KaBzVqeCya0ZHGkVIK5XEhL0ZNqt8nfTH9JyD3sZY+dfqCPqOp2B3o5r1ItTTuF H+hbL3AfO+aAyWAowcQVNuzIDLx0z6TmI5xGdn7JwdEAwF42INGPznc7C1IzdwzHILXN x7Ew== 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=vE95K+o7MS7XWkGcyJsW0K9Pz//5IQxk67nCADlyhDM=; b=QxV9XAGrMAR67SWfMyctzfDlWkxKY040Dn+7sjSRfGwy4dEYjb6mliiUeWRvi2gWxH hEj0+Yr+WeOhb3IH2jHan+Ek8HSOUOcvoeH47tF3P3IoAz575F9Ti6Vff5jSL4U49JL5 +wrOMXLBIGBwUsAIDtHr0bjobyeYh3VOoP91qw5nC2fmiZzVXcQ0cdAt7sxbxnaiKvii 7L+Cih6PUtSsGnPEkrHI/TLkOI5Ay2aVh/kXbkTP4bvxg9ruUDQ5YhaoHx0mUwXO+MPS AJvOtPhDipO62JmI0Po16irmAZz9ybIq5mleqepzw7EeZ3NOZ5Q1XYlStBEoQuN37DHw OaiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZWaH8MKz; 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 d9-20020a170906370900b006e8346fb799si1871981ejc.270.2022.04.09.19.25.11; Sat, 09 Apr 2022 19:25:36 -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=ZWaH8MKz; 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 S230102AbiDIUJo (ORCPT + 99 others); Sat, 9 Apr 2022 16:09:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230215AbiDIUJn (ORCPT ); Sat, 9 Apr 2022 16:09:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C1B61557EE for ; Sat, 9 Apr 2022 13:07:35 -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 AEA0360AF0 for ; Sat, 9 Apr 2022 20:07:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B884BC385A6; Sat, 9 Apr 2022 20:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649534854; bh=8s36uDwAQ6drbCdhPcH2bpOPAXfnPHdl8tI9JW7lbvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZWaH8MKzBoPCVStXuVC/zwCgXkC1Ti+5gAFzVqDTF0jhU285MfBNmgxQjZ4tWpzwy /YAOz+QyGPK/TYGacxe9rMIU45nkcaxys3EVz7d8c1sFMSuLdt8fKqvDx142Ys+TNS yTQiIsZ4ioOJh88JGigHnT6z5yyrqPg7CiX4LMtrGIDMUFuJfaEoO54Zgf4EkjZThj rHZJqyUM6HPiZcwUTHKDeKWuKddeJOwB+O8GHMl+tONakCGOQX2fH8mFweuAUVgCu6 oMR95O1c+lQhQQB/blnTHEs0v7tuO3i1puB3GaXXXmTiqTuHz4wcMGdTwetfJKrpai VWFjPy2h5QpAQ== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: ChenXiaoSong , Scott Mayhew Subject: [PATCH 2/2] NFS: Don't report write errors twice Date: Sat, 9 Apr 2022 16:01:08 -0400 Message-Id: <20220409200108.94208-2-trondmy@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220409200108.94208-1-trondmy@kernel.org> References: <20220409200108.94208-1-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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 Any errors reported by the write() system call need to be cleared from the file descriptor's error tracking. The current call to nfs_wb_all() causes the error to be reported, but since it doesn't call file_check_and_advance_wb_err(), we can end up reporting the same error a second time when the application calls fsync(). Reported-by: ChenXiaoSong Fixes: ce368536dd61 ("nfs: nfs_file_write() should check for writeback errors") Signed-off-by: Trond Myklebust --- fs/nfs/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 81c80548a5c6..54dc6f176f5c 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -677,9 +677,10 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) /* Return error values */ error = filemap_check_wb_err(file->f_mapping, since); if (nfs_need_check_write(file, inode, error)) { - int err = nfs_wb_all(inode); - if (err < 0) - result = err; + nfs_wb_all(inode); + error = file_check_and_advance_wb_err(file); + if (error < 0) + result = error; } nfs_add_stats(inode, NFSIOS_NORMALWRITTENBYTES, written); out: -- 2.35.1