Merge tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull iomap updates from Darrick Wong:
 "After last week's failed pull request attempt, I scuttled everything
  in the branch except for the directio endio api changes, which were
  trivial. Everything else will simply have to wait for the next cycle.

  Summary:

   - Report both io errors and short io results to the directio endio
     handler.

   - Allow directio callers to pass an ops structure to iomap_dio_rw"

* tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: move the iomap_dio_rw ->end_io callback into a structure
  iomap: split size and error for iomap_dio_rw ->end_io

diff --combined fs/xfs/xfs_file.c
index d952d59,21bd3d5..1ffb179
--- 1/fs/xfs/xfs_file.c
--- 2/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@@ -28,7 -28,6 +28,7 @@@
  #include <linux/falloc.h>
  #include <linux/backing-dev.h>
  #include <linux/mman.h>
 +#include <linux/fadvise.h>
  
  static const struct vm_operations_struct xfs_file_vm_ops;
  
@@@ -370,21 -369,23 +370,23 @@@ static in
  xfs_dio_write_end_io(
        struct kiocb            *iocb,
        ssize_t                 size,
+       int                     error,
        unsigned                flags)
  {
        struct inode            *inode = file_inode(iocb->ki_filp);
        struct xfs_inode        *ip = XFS_I(inode);
        loff_t                  offset = iocb->ki_pos;
        unsigned int            nofs_flag;
-       int                     error = 0;
  
        trace_xfs_end_io_direct_write(ip, offset, size);
  
        if (XFS_FORCED_SHUTDOWN(ip->i_mount))
                return -EIO;
  
-       if (size <= 0)
-               return size;
+       if (error)
+               return error;
+       if (!size)
+               return 0;
  
        /*
         * Capture amount written on completion as we can't reliably account
@@@ -441,6 -442,10 +443,10 @@@ out
        return error;
  }
  
+ static const struct iomap_dio_ops xfs_dio_write_ops = {
+       .end_io         = xfs_dio_write_end_io,
+ };
+ 
  /*
   * xfs_file_dio_aio_write - handle direct IO writes
   *
@@@ -541,7 -546,7 +547,7 @@@ xfs_file_dio_aio_write
        }
  
        trace_xfs_file_direct_write(ip, count, iocb->ki_pos);
-       ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, xfs_dio_write_end_io);
+       ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops);
  
        /*
         * If unaligned, this is the only IO in-flight. If it has not yet
@@@ -934,30 -939,6 +940,30 @@@ out_unlock
        return error;
  }
  
 +STATIC int
 +xfs_file_fadvise(
 +      struct file     *file,
 +      loff_t          start,
 +      loff_t          end,
 +      int             advice)
 +{
 +      struct xfs_inode *ip = XFS_I(file_inode(file));
 +      int ret;
 +      int lockflags = 0;
 +
 +      /*
 +       * Operations creating pages in page cache need protection from hole
 +       * punching and similar ops
 +       */
 +      if (advice == POSIX_FADV_WILLNEED) {
 +              lockflags = XFS_IOLOCK_SHARED;
 +              xfs_ilock(ip, lockflags);
 +      }
 +      ret = generic_fadvise(file, start, end, advice);
 +      if (lockflags)
 +              xfs_iunlock(ip, lockflags);
 +      return ret;
 +}
  
  STATIC loff_t
  xfs_file_remap_range(
@@@ -1257,7 -1238,6 +1263,7 @@@ const struct file_operations xfs_file_o
        .fsync          = xfs_file_fsync,
        .get_unmapped_area = thp_get_unmapped_area,
        .fallocate      = xfs_file_fallocate,
 +      .fadvise        = xfs_file_fadvise,
        .remap_file_range = xfs_file_remap_range,
  };