All of lore.kernel.org
 help / color / mirror / Atom feed
From: trondmy@kernel.org
To: linux-nfs@vger.kernel.org
Cc: ChenXiaoSong <chenxiaosong2@huawei.com>,
	Scott Mayhew <smayhew@redhat.com>
Subject: [PATCH 2/2] NFS: Don't report write errors twice
Date: Sat,  9 Apr 2022 16:01:08 -0400	[thread overview]
Message-ID: <20220409200108.94208-2-trondmy@kernel.org> (raw)
In-Reply-To: <20220409200108.94208-1-trondmy@kernel.org>

From: Trond Myklebust <trond.myklebust@hammerspace.com>

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 <chenxiaosong2@huawei.com>
Fixes: ce368536dd61 ("nfs: nfs_file_write() should check for writeback errors")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
 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


  reply	other threads:[~2022-04-09 20:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-09 20:01 [PATCH 1/2] NFS: Do not report EINTR/ERESTARTSYS as mapping errors trondmy
2022-04-09 20:01 ` trondmy [this message]
2022-04-11 14:03   ` [PATCH 2/2] NFS: Don't report write errors twice chenxiaosong (A)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220409200108.94208-2-trondmy@kernel.org \
    --to=trondmy@kernel.org \
    --cc=chenxiaosong2@huawei.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=smayhew@redhat.com \
    --subject='Re: [PATCH 2/2] NFS: Don'\''t report write errors twice' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.