1 files changed, 7 insertions, 8 deletions

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index cc6a7b5a9912..3f2b9f2a7b94 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -458,7 +458,7 @@ xfs_iomap_write_direct(
                 extsz = ip->i_d.di_extsize;
         }
 
-        isize = ip->i_d.di_size;
+        isize = ip->i_size;
         if (io->io_new_size > isize)
                 isize = io->io_new_size;
 
@@ -524,7 +524,7 @@ xfs_iomap_write_direct(
         xfs_trans_ihold(tp, ip);
 
         bmapi_flag = XFS_BMAPI_WRITE;
-        if ((flags & BMAPI_DIRECT) && (offset < ip->i_d.di_size || extsz))
+        if ((flags & BMAPI_DIRECT) && (offset < ip->i_size || extsz))
                 bmapi_flag |= XFS_BMAPI_PREALLOC;
 
         /*
@@ -543,7 +543,7 @@ xfs_iomap_write_direct(
         error = xfs_bmap_finish(&tp, &free_list, &committed);
         if (error)
                 goto error0;
-        error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
+        error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
         if (error)
                 goto error_out;
 
@@ -676,7 +676,7 @@ xfs_iomap_write_delay(
         offset_fsb = XFS_B_TO_FSBT(mp, offset);
 
 retry:
-        isize = ip->i_d.di_size;
+        isize = ip->i_size;
         if (io->io_new_size > isize)
                 isize = io->io_new_size;
 
@@ -817,7 +817,7 @@ xfs_iomap_write_allocate(
                          * we dropped the ilock in the interim.
                          */
 
-                        end_fsb = XFS_B_TO_FSB(mp, ip->i_d.di_size);
+                        end_fsb = XFS_B_TO_FSB(mp, ip->i_size);
                         xfs_bmap_last_offset(NULL, ip, &last_block,
                                 XFS_DATA_FORK);
                         last_block = XFS_FILEOFF_MAX(last_block, end_fsb);
@@ -840,8 +840,7 @@ xfs_iomap_write_allocate(
                         if (error)
                                 goto trans_cancel;
 
-                        error = xfs_trans_commit(tp,
-                                        XFS_TRANS_RELEASE_LOG_RES, NULL);
+                        error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
                         if (error)
                                 goto error0;
 
@@ -948,7 +947,7 @@ xfs_iomap_write_unwritten(
                 if (error)
                         goto error_on_bmapi_transaction;
 
-                error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
+                error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
                 xfs_iunlock(ip, XFS_ILOCK_EXCL);
                 if (error)
                         return XFS_ERROR(error);