1 files changed, 7 insertions, 4 deletions

diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c
index 9014d7e44488..20ffec308e1e 100644
--- a/fs/xfs/xfs_utils.c
+++ b/fs/xfs/xfs_utils.c
@@ -222,7 +222,7 @@ xfs_dir_ialloc(
                 }
 
                 ntp = xfs_trans_dup(tp);
-                code = xfs_trans_commit(tp, 0, NULL);
+                code = xfs_trans_commit(tp, 0);
                 tp = ntp;
                 if (committed != NULL) {
                         *committed = 1;
@@ -420,7 +420,11 @@ xfs_truncate_file(
          * in a transaction.
          */
         xfs_ilock(ip, XFS_IOLOCK_EXCL);
-        xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE, (xfs_fsize_t)0);
+        error = xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE, (xfs_fsize_t)0);
+        if (error) {
+                xfs_iunlock(ip, XFS_IOLOCK_EXCL);
+                return error;
+        }
 
         tp = xfs_trans_alloc(mp, XFS_TRANS_TRUNCATE_FILE);
         if ((error = xfs_trans_reserve(tp, 0, XFS_ITRUNCATE_LOG_RES(mp), 0,
@@ -460,8 +464,7 @@ xfs_truncate_file(
                                  XFS_TRANS_ABORT);
         } else {
                 xfs_ichgtime(ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
-                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 | XFS_IOLOCK_EXCL);