Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux

Pull writeback error handling updates from Jeff Layton:
 "This pile continues the work from last cycle on better tracking
  writeback errors. In v4.13 we added some basic errseq_t infrastructure
  and converted a few filesystems to use it.

  This set continues refining that infrastructure, adds documentation,
  and converts most of the other filesystems to use it. The main
  exception at this point is the NFS client"

* tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  ecryptfs: convert to file_write_and_wait in ->fsync
  mm: remove optimizations based on i_size in mapping writeback waits
  fs: convert a pile of fsync routines to errseq_t based reporting
  gfs2: convert to errseq_t based writeback error reporting for fsync
  fs: convert sync_file_range to use errseq_t based error-tracking
  mm: add file_fdatawait_range and file_write_and_wait
  fuse: convert to errseq_t based error tracking for fsync
  mm: consolidate dax / non-dax checks for writeback
  Documentation: add some docs for errseq_t
  errseq: rename __errseq_set to errseq_set

23 files changed, 31 insertions, 29 deletions

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 43c242e17132..03c9e325bfbc 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -445,7 +445,7 @@ static int v9fs_file_fsync(struct file *filp, loff_t start, loff_t end,
         struct p9_wstat wstat;
         int retval;
 
-        retval = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        retval = file_write_and_wait_range(filp, start, end);
         if (retval)
                 return retval;
 
@@ -468,7 +468,7 @@ int v9fs_file_fsync_dotl(struct file *filp, loff_t start, loff_t end,
         struct inode *inode = filp->f_mapping->host;
         int retval;
 
-        retval = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        retval = file_write_and_wait_range(filp, start, end);
         if (retval)
                 return retval;
 
diff --git a/fs/affs/file.c b/fs/affs/file.c
index 196ee7f6fdc4..00331810f690 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -954,7 +954,7 @@ int affs_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
         struct inode *inode = filp->f_mapping->host;
         int ret, err;
 
-        err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        err = file_write_and_wait_range(filp, start, end);
         if (err)
                 return err;
 
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 2d2fccd5044b..106e43db1115 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -714,7 +714,7 @@ int afs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                vnode->fid.vid, vnode->fid.vnode, file,
                datasync);
 
-        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        ret = file_write_and_wait_range(file, start, end);
         if (ret)
                 return ret;
         inode_lock(inode);
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index bc09df6b473a..0786f19d288f 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2329,7 +2329,7 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end,
         struct inode *inode = file_inode(file);
         struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
 
-        rc = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        rc = file_write_and_wait_range(file, start, end);
         if (rc)
                 return rc;
         inode_lock(inode);
@@ -2371,7 +2371,7 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
         struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file);
         struct inode *inode = file->f_mapping->host;
 
-        rc = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        rc = file_write_and_wait_range(file, start, end);
         if (rc)
                 return rc;
         inode_lock(inode);
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index ca4e83750214..c74ed3ca3372 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -328,7 +328,7 @@ ecryptfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
         int rc;
 
-        rc = filemap_write_and_wait(file->f_mapping);
+        rc = file_write_and_wait(file);
         if (rc)
                 return rc;
 
diff --git a/fs/exofs/file.c b/fs/exofs/file.c
index 28645f0640f7..a94594ea2aa3 100644
--- a/fs/exofs/file.c
+++ b/fs/exofs/file.c
@@ -48,7 +48,7 @@ static int exofs_file_fsync(struct file *filp, loff_t start, loff_t end,
         struct inode *inode = filp->f_mapping->host;
         int ret;
 
-        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        ret = file_write_and_wait_range(filp, start, end);
         if (ret)
                 return ret;
 
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 2706130c261b..843a0d99f7ea 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -206,7 +206,7 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,
         /* if fdatasync is triggered, let's do in-place-update */
         if (datasync || get_dirty_pages(inode) <= SM_I(sbi)->min_fsync_blocks)
                 set_inode_flag(inode, FI_NEED_IPU);
-        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        ret = file_write_and_wait_range(file, start, end);
         clear_inode_flag(inode, FI_NEED_IPU);
 
         if (ret) {
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 0273029b1220..d66789804287 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -457,7 +457,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
          * wait for all outstanding writes, before sending the FSYNC
          * request.
          */
-        err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        err = file_write_and_wait_range(file, start, end);
         if (err)
                 goto out;
 
@@ -465,10 +465,10 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
 
         /*
          * Due to implementation of fuse writeback
-         * filemap_write_and_wait_range() does not catch errors.
+         * file_write_and_wait_range() does not catch errors.
          * We have to do this directly after fuse_sync_writes()
          */
-        err = filemap_check_errors(file->f_mapping);
+        err = file_check_and_advance_wb_err(file);
         if (err)
                 goto out;
 
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index bb48074be019..33a0cb5701a3 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -668,12 +668,14 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end,
                 if (ret)
                         return ret;
                 if (gfs2_is_jdata(ip))
-                        filemap_write_and_wait(mapping);
+                        ret = file_write_and_wait(file);
+                if (ret)
+                        return ret;
                 gfs2_ail_flush(ip->i_gl, 1);
         }
 
         if (mapping->nrpages)
-                ret = filemap_fdatawait_range(mapping, start, end);
+                ret = file_fdatawait_range(file, start, end);
 
         return ret ? ret : ret1;
 }
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index bfbba799430f..2538b49cc349 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -656,7 +656,7 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end,
         struct super_block * sb;
         int ret, err;
 
-        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        ret = file_write_and_wait_range(filp, start, end);
         if (ret)
                 return ret;
         inode_lock(inode);
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index e8638d528195..4f26b6877130 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -283,7 +283,7 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
         struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);
         int error = 0, error2;
 
-        error = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        error = file_write_and_wait_range(file, start, end);
         if (error)
                 return error;
         inode_lock(inode);
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index e61261a7417e..c148e7f4f451 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -374,7 +374,7 @@ static int hostfs_fsync(struct file *file, loff_t start, loff_t end,
         struct inode *inode = file->f_mapping->host;
         int ret;
 
-        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        ret = file_write_and_wait_range(file, start, end);
         if (ret)
                 return ret;
 
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index b3be1b5a62e2..f26138425b16 100644
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -24,7 +24,7 @@ int hpfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
         struct inode *inode = file->f_mapping->host;
         int ret;
 
-        ret = filemap_write_and_wait_range(file->f_mapping, start, end);
+        ret = file_write_and_wait_range(file, start, end);
         if (ret)
                 return ret;
         return sync_blockdev(inode->i_sb->s_bdev);
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index c12476e309c6..bd0428bebe9b 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -35,7 +35,7 @@ int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
         struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
         int ret;
 
-        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        ret = file_write_and_wait_range(filp, start, end);
         if (ret)
                 return ret;
 
diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 739492c7a3fd..36665fd37095 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -34,7 +34,7 @@ int jfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
         struct inode *inode = file->f_mapping->host;
         int rc = 0;
 
-        rc = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        rc = file_write_and_wait_range(file, start, end);
         if (rc)
                 return rc;
 
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 76965e772264..a06c07619ee6 100644
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -23,7 +23,7 @@
 
 static int ncp_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
-        return filemap_write_and_wait_range(file->f_mapping, start, end);
+        return file_write_and_wait_range(file, start, end);
 }
 
 /*
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index 0ee19ecc982d..1a24be9e8405 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -1506,7 +1506,7 @@ static int ntfs_dir_fsync(struct file *filp, loff_t start, loff_t end,
 
         ntfs_debug("Entering for inode 0x%lx.", vi->i_ino);
 
-        err = filemap_write_and_wait_range(vi->i_mapping, start, end);
+        err = file_write_and_wait_range(filp, start, end);
         if (err)
                 return err;
         inode_lock(vi);
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index c4f68c338735..331910fa8442 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1989,7 +1989,7 @@ static int ntfs_file_fsync(struct file *filp, loff_t start, loff_t end,
 
         ntfs_debug("Entering for inode 0x%lx.", vi->i_ino);
 
-        err = filemap_write_and_wait_range(vi->i_mapping, start, end);
+        err = file_write_and_wait_range(filp, start, end);
         if (err)
                 return err;
         inode_lock(vi);
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index bfeb647459d9..66e59d3163ea 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -196,7 +196,7 @@ static int ocfs2_sync_file(struct file *file, loff_t start, loff_t end,
         if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
                 return -EROFS;
 
-        err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        err = file_write_and_wait_range(file, start, end);
         if (err)
                 return err;
 
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index 45aa05e2232f..5b50689d8539 100644
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -34,7 +34,7 @@ static int reiserfs_dir_fsync(struct file *filp, loff_t start, loff_t end,
         struct inode *inode = filp->f_mapping->host;
         int err;
 
-        err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        err = file_write_and_wait_range(filp, start, end);
         if (err)
                 return err;
 
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index b396eb09f288..843aadcc123c 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -154,7 +154,7 @@ static int reiserfs_sync_file(struct file *filp, loff_t start, loff_t end,
         int err;
         int barrier_done;
 
-        err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        err = file_write_and_wait_range(filp, start, end);
         if (err)
                 return err;
 
diff --git a/fs/sync.c b/fs/sync.c
index 2a54c1f22035..27d6b8bbcb6a 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -342,7 +342,7 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes,
 
         ret = 0;
         if (flags & SYNC_FILE_RANGE_WAIT_BEFORE) {
-                ret = filemap_fdatawait_range(mapping, offset, endbyte);
+                ret = file_fdatawait_range(f.file, offset, endbyte);
                 if (ret < 0)
                         goto out_put;
         }
@@ -355,7 +355,7 @@ 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);
+                ret = file_fdatawait_range(f.file, offset, endbyte);
 
 out_put:
         fdput(f);
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 8cad0b19b404..f90a466ea5db 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1337,7 +1337,7 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                  */
                 return 0;
 
-        err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        err = file_write_and_wait_range(file, start, end);
         if (err)
                 return err;
         inode_lock(inode);