* [PATCH 1/2] NFS: Do not report EINTR/ERESTARTSYS as mapping errors
@ 2022-04-09 20:01 trondmy
2022-04-09 20:01 ` [PATCH 2/2] NFS: Don't report write errors twice trondmy
0 siblings, 1 reply; 3+ messages in thread
From: trondmy @ 2022-04-09 20:01 UTC (permalink / raw)
To: linux-nfs; +Cc: ChenXiaoSong, Scott Mayhew
From: Trond Myklebust <trond.myklebust@hammerspace.com>
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 <trond.myklebust@hammerspace.com>
---
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 e864ac836237..9d3ac6edc901 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1436,7 +1436,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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] NFS: Don't report write errors twice
2022-04-09 20:01 [PATCH 1/2] NFS: Do not report EINTR/ERESTARTSYS as mapping errors trondmy
@ 2022-04-09 20:01 ` trondmy
2022-04-11 14:03 ` chenxiaosong (A)
0 siblings, 1 reply; 3+ messages in thread
From: trondmy @ 2022-04-09 20:01 UTC (permalink / raw)
To: linux-nfs; +Cc: ChenXiaoSong, Scott Mayhew
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] NFS: Don't report write errors twice
2022-04-09 20:01 ` [PATCH 2/2] NFS: Don't report write errors twice trondmy
@ 2022-04-11 14:03 ` chenxiaosong (A)
0 siblings, 0 replies; 3+ messages in thread
From: chenxiaosong (A) @ 2022-04-11 14:03 UTC (permalink / raw)
To: trondmy, linux-nfs; +Cc: Scott Mayhew, zhangxiaoxu (A), zhangyi (F)
在 2022/4/10 4:01, 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:
>
After merging this patchset, second `dd` of the following reproducer
will still report unexpected error: No space left on device.
Reproducer:
nfs server | nfs client
-----------------------------|---------------------------------------------
# No space left on server |
fallocate -l 100G /svr/nospc |
| mount -t nfs $nfs_server_ip:/ /mnt
|
| # Expected error: No space left on device
| dd if=/dev/zero of=/mnt/file count=1
ibs=10K
|
| # Release space on mountpoint
| rm /mnt/nospc
|
| # Unexpected error: No space left on device
| dd if=/dev/zero of=/mnt/file count=1
ibs=10K
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-11 14:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-09 20:01 [PATCH 1/2] NFS: Do not report EINTR/ERESTARTSYS as mapping errors trondmy
2022-04-09 20:01 ` [PATCH 2/2] NFS: Don't report write errors twice trondmy
2022-04-11 14:03 ` chenxiaosong (A)
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.