NFS: Do not report EINTR/ERESTARTSYS as mapping errors
Subsystems (2)
[email protected]
maintainerPATCH 1/2 NFS: Do not report EINTR/ERESTARTSYS as mapping errors
From: Trond Myklebust <[email protected]>
If the attempt to flush data was interrupted due to a local signal, then just requeue the writes back for I/O.
--- fs/nfs/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/write.c +1 -1
@@ -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);
Signature · 1 line
2.35.1
[email protected]
maintainerPATCH 2/2 NFS: Don't report write errors twice
From: Trond Myklebust <[email protected]>
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().
--- fs/nfs/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/nfs/file.c +4 -3
@@ -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:
Signature · 1 line
2.35.1
Re: [PATCH 2/2] NFS: Don't report write errors twice
Quoted 24 lines · 在 2022/4/10 4:01, [email protected] 写道:
From: Trond Myklebust <[email protected]>
Any errors reported by the
write()system call need to be cleared from the file descriptor's error tracking. The current call tonfs_wb_all()causes the error to be reported, but since it doesn't callfile_check_and_advance_wb_err(), we can end up reporting the same error a second time when the application callsfsync().Reported-by ChenXiaoSong <[email protected]>Fixes ce368536dd61 ("nfs: nfs_file_write() should check for writeback errors")Signed-off-by Trond Myklebust <[email protected]>--- fs/nfs/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)fs/nfs/file.c +0
-0@@ -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)) {
fs/nfs/file.c ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) · line 686
Quoted 10 lines
fs/nfs/file.c +4
-3-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