Merge branch 'iomap-fixes-4.8-rc3' into for-next

diff --combined fs/xfs/xfs_iomap.c
index 4398932,697c8fd..2af0dda
--- 1/fs/xfs/xfs_iomap.c
--- 2/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@@ -715,16 -715,12 +715,16 @@@ xfs_iomap_write_allocate
                 * is in the delayed allocation extent on which we sit
                 * but before our buffer starts.
                 */
 -
                nimaps = 0;
                while (nimaps == 0) {
                        nres = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);
 -
 -                      error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, nres,
 +                      /*
 +                       * We have already reserved space for the extent and any
 +                       * indirect blocks when creating the delalloc extent,
 +                       * there is no need to reserve space in this transaction
 +                       * again.
 +                       */
 +                      error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, 0,
                                        0, XFS_TRANS_RESERVE, &tp);
                        if (error)
                                return error;
@@@ -1041,20 -1037,14 +1041,14 @@@ xfs_file_iomap_begin
                        return error;
  
                trace_xfs_iomap_alloc(ip, offset, length, 0, &imap);
-               xfs_bmbt_to_iomap(ip, iomap, &imap);
-       } else if (nimaps) {
-               xfs_iunlock(ip, XFS_ILOCK_EXCL);
-               trace_xfs_iomap_found(ip, offset, length, 0, &imap);
-               xfs_bmbt_to_iomap(ip, iomap, &imap);
        } else {
+               ASSERT(nimaps);
+ 
                xfs_iunlock(ip, XFS_ILOCK_EXCL);
-               trace_xfs_iomap_not_found(ip, offset, length, 0, &imap);
-               iomap->blkno = IOMAP_NULL_BLOCK;
-               iomap->type = IOMAP_HOLE;
-               iomap->offset = offset;
-               iomap->length = length;
+               trace_xfs_iomap_found(ip, offset, length, 0, &imap);
        }
  
+       xfs_bmbt_to_iomap(ip, iomap, &imap);
        return 0;
  }
  
@@@ -1116,3 -1106,48 +1110,48 @@@ struct iomap_ops xfs_iomap_ops = 
        .iomap_begin            = xfs_file_iomap_begin,
        .iomap_end              = xfs_file_iomap_end,
  };
+ 
+ static int
+ xfs_xattr_iomap_begin(
+       struct inode            *inode,
+       loff_t                  offset,
+       loff_t                  length,
+       unsigned                flags,
+       struct iomap            *iomap)
+ {
+       struct xfs_inode        *ip = XFS_I(inode);
+       struct xfs_mount        *mp = ip->i_mount;
+       xfs_fileoff_t           offset_fsb = XFS_B_TO_FSBT(mp, offset);
+       xfs_fileoff_t           end_fsb = XFS_B_TO_FSB(mp, offset + length);
+       struct xfs_bmbt_irec    imap;
+       int                     nimaps = 1, error = 0;
+       unsigned                lockmode;
+ 
+       if (XFS_FORCED_SHUTDOWN(mp))
+               return -EIO;
+ 
+       lockmode = xfs_ilock_data_map_shared(ip);
+ 
+       /* if there are no attribute fork or extents, return ENOENT */
+       if (XFS_IFORK_Q(ip) || !ip->i_d.di_anextents) {
+               error = -ENOENT;
+               goto out_unlock;
+       }
+ 
+       ASSERT(ip->i_d.di_aformat != XFS_DINODE_FMT_LOCAL);
+       error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, &imap,
+                              &nimaps, XFS_BMAPI_ENTIRE | XFS_BMAPI_ATTRFORK);
+ out_unlock:
+       xfs_iunlock(ip, lockmode);
+ 
+       if (!error) {
+               ASSERT(nimaps);
+               xfs_bmbt_to_iomap(ip, iomap, &imap);
+       }
+ 
+       return error;
+ }
+ 
+ struct iomap_ops xfs_xattr_iomap_ops = {
+       .iomap_begin            = xfs_xattr_iomap_begin,
+ };