[PATCH v5 06/17] fs: adapt sync_file_range to new reporting infrastructure
From: Jeff Layton <hidden>
Date: 2017-05-31 12:45:29
Also in:
linux-block, linux-fsdevel, lkml
Subsystem:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
Since it returns errors in a way similar to fsync, have it use the same method for returning previously-reported writeback errors. Signed-off-by: Jeff Layton <redacted> --- fs/sync.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/fs/sync.c b/fs/sync.c
index ec93aac4feb9..819a81526714 100644
--- a/fs/sync.c
+++ b/fs/sync.c@@ -275,8 +275,11 @@ SYSCALL_DEFINE1(fdatasync, unsigned int, fd) * * * SYNC_FILE_RANGE_WAIT_BEFORE and SYNC_FILE_RANGE_WAIT_AFTER will detect any - * I/O errors or ENOSPC conditions and will return those to the caller, after - * clearing the EIO and ENOSPC flags in the address_space. + * error condition that occurred prior to or after writeback, and will return + * that to the caller, while advancing the file's errseq_t cursor. Note that + * any errors returned here may have occurred in an area of the file that is + * not covered by the given range as most filesystems track writeback errors + * on a per-address_space basis * * It should be noted that none of these operations write out the file's * metadata. So unless the application is strictly performing overwrites of
@@ -343,19 +346,25 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes, if (flags & SYNC_FILE_RANGE_WAIT_BEFORE) { ret = filemap_fdatawait_range(mapping, offset, endbyte); if (ret < 0) - goto out_put; + goto out_report; } if (flags & SYNC_FILE_RANGE_WRITE) { ret = __filemap_fdatawrite_range(mapping, offset, endbyte, WB_SYNC_NONE); if (ret < 0) - goto out_put; + goto out_report; } if (flags & SYNC_FILE_RANGE_WAIT_AFTER) ret = filemap_fdatawait_range(mapping, offset, endbyte); +out_report: + if (mapping->host->i_sb->s_type->fs_flags & FS_WB_ERRSEQ) { + int ret2 = filemap_report_wb_err(f.file); + if (!ret) + ret = ret2; + } out_put: fdput(f); out:
--
2.9.4