1 files changed, 9 insertions, 5 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 418582b709eb..3a8fe7bfa2af 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3003,15 +3003,15 @@ xlog_recover_process_efi(
 
         tp = xfs_trans_alloc(mp, 0);
         error = xfs_trans_reserve(tp, 0, XFS_ITRUNCATE_LOG_RES(mp), 0, 0, 0);
-        if (error) {
-                xfs_trans_cancel(tp, XFS_TRANS_ABORT);
-                return error;
-        }
+        if (error)
+                goto abort_error;
         efdp = xfs_trans_get_efd(tp, efip, efip->efi_format.efi_nextents);
 
         for (i = 0; i < efip->efi_format.efi_nextents; i++) {
                 extp = &(efip->efi_format.efi_extents[i]);
-                xfs_free_extent(tp, extp->ext_start, extp->ext_len);
+                error = xfs_free_extent(tp, extp->ext_start, extp->ext_len);
+                if (error)
+                        goto abort_error;
                 xfs_trans_log_efd_extent(tp, efdp, extp->ext_start,
                                          extp->ext_len);
         }
@@ -3019,6 +3019,10 @@ xlog_recover_process_efi(
         efip->efi_flags |= XFS_EFI_RECOVERED;
         error = xfs_trans_commit(tp, 0);
         return error;
+
+abort_error:
+        xfs_trans_cancel(tp, XFS_TRANS_ABORT);
+        return error;
 }
 
 /*