From: Jeff Layton Subject: [PATCH v4 16/27] fs: adapt sync_file_range to new reporting infrastructure Date: Tue, 9 May 2017 11:49:19 -0400 Message-ID: <20170509154930.29524-17-jlayton@redhat.com> References: <20170509154930.29524-1-jlayton@redhat.com> Cc: axboe@kernel.dk, tytso@mit.edu, mawilcox@microsoft.com, neilb@suse.de, corbet@lwn.net, josef@toxicpanda.com, dhowells@redhat.com, clm@fb.com, bo.li.liu@oracle.com, viro@zeniv.linux.org.uk, jack@suse.com, akpm@linux-foundation.org, ross.zwisler@linux.intel.com, hubcap@omnibond.com To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, jfs-discussion@lists.sourceforge.net, linux-xfs@vger.kernel.org, cluster-devel@redhat.com, linux-f2fs-devel@lists.sourceforge.net, v9fs-developer@lists.sourceforge.net, linux-nilfs@vger.kernel.org, linux-block@vger.kernel.org Return-path: In-Reply-To: <20170509154930.29524-1-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: cluster-devel-bounces@redhat.com Errors-To: cluster-devel-bounces@redhat.com List-Id: linux-ext4.vger.kernel.org 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 --- fs/sync.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/sync.c b/fs/sync.c index 11ba023434b1..89a03b5252d2 100644 --- a/fs/sync.c +++ b/fs/sync.c @@ -271,8 +271,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 @@ -282,7 +285,7 @@ SYSCALL_DEFINE1(fdatasync, unsigned int, fd) SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes, unsigned int, flags) { - int ret; + int ret, ret2; struct fd f; struct address_space *mapping; loff_t endbyte; /* inclusive */ @@ -356,7 +359,9 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes, if (flags & SYNC_FILE_RANGE_WAIT_AFTER) ret = filemap_fdatawait_range(mapping, offset, endbyte); - + ret2 = filemap_report_wb_error(f.file); + if (!ret) + ret = ret2; out_put: fdput(f); out: -- 2.9.3