1 files changed, 10 insertions, 12 deletions

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 2edd6769e5d3..d0f5be63cddb 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -226,13 +226,12 @@ xfs_iomap(
                 xfs_iomap_enter_trace(XFS_IOMAP_READ_ENTER, io, offset, count);
                 lockmode = XFS_LCK_MAP_SHARED(mp, io);
                 bmapi_flags = XFS_BMAPI_ENTIRE;
-                if (flags & BMAPI_IGNSTATE)
-                        bmapi_flags |= XFS_BMAPI_IGSTATE;
                 break;
         case BMAPI_WRITE:
                 xfs_iomap_enter_trace(XFS_IOMAP_WRITE_ENTER, io, offset, count);
                 lockmode = XFS_ILOCK_EXCL|XFS_EXTSIZE_WR;
-                bmapi_flags = 0;
+                if (flags & BMAPI_IGNSTATE)
+                        bmapi_flags |= XFS_BMAPI_IGSTATE|XFS_BMAPI_ENTIRE;
                 XFS_ILOCK(mp, io, lockmode);
                 break;
         case BMAPI_ALLOCATE:
@@ -391,9 +390,9 @@ xfs_iomap_write_direct(
         xfs_bmbt_irec_t imap[XFS_WRITE_IMAPS], *imapp;
         xfs_bmap_free_t free_list;
         int             aeof;
-        xfs_filblks_t   datablocks, qblocks, resblks;
+        xfs_filblks_t   qblocks, resblks;
         int             committed;
-        int             numrtextents;
+        int             resrtextents;
 
         /*
          * Make sure that the dquots are there. This doesn't hold
@@ -434,14 +433,14 @@ xfs_iomap_write_direct(
 
                 if (!(extsz = ip->i_d.di_extsize))
                         extsz = mp->m_sb.sb_rextsize;
-                numrtextents = qblocks = (count_fsb + extsz - 1);
-                do_div(numrtextents, mp->m_sb.sb_rextsize);
+                resrtextents = qblocks = (count_fsb + extsz - 1);
+                do_div(resrtextents, mp->m_sb.sb_rextsize);
+                resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0);
                 quota_flag = XFS_QMOPT_RES_RTBLKS;
-                datablocks = 0;
         } else {
-                datablocks = qblocks = count_fsb;
+                resrtextents = 0;
+                resblks = qblocks = XFS_DIOSTRAT_SPACE_RES(mp, count_fsb);
                 quota_flag = XFS_QMOPT_RES_REGBLKS;
-                numrtextents = 0;
         }
 
         /*
@@ -449,9 +448,8 @@ xfs_iomap_write_direct(
          */
         xfs_iunlock(ip, XFS_ILOCK_EXCL);
         tp = xfs_trans_alloc(mp, XFS_TRANS_DIOSTRAT);
-        resblks = XFS_DIOSTRAT_SPACE_RES(mp, datablocks);
         error = xfs_trans_reserve(tp, resblks,
-                        XFS_WRITE_LOG_RES(mp), numrtextents,
+                        XFS_WRITE_LOG_RES(mp), resrtextents,
                         XFS_TRANS_PERM_LOG_RES,
                         XFS_WRITE_LOG_COUNT);