diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-04 05:55:48 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-04 05:55:48 +0200 |
| commit | 4ea79766168b64766d6c9fcdaa9fab83a6cfebcf (patch) | |
| tree | 7b29eaf46119a920f277b5cd13c818e2d35beafa /fs/xfs/xfs_log_recover.c | |
| parent | Merge branch 'xfs-misc-fixes-for-4.2-2' into for-next (diff) | |
| parent | xfs: fix xfs_log_done interface (diff) | |
| download | linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.xz linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.zip | |
Merge branch 'xfs-commit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_attr_inactive.c
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 4a8c440b6280..299fbaff1f2c 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -3761,11 +3761,11 @@ xlog_recover_process_efi( } set_bit(XFS_EFI_RECOVERED, &efip->efi_flags); - error = xfs_trans_commit(tp, 0); + error = xfs_trans_commit(tp); return error; abort_error: - xfs_trans_cancel(tp, XFS_TRANS_ABORT); + xfs_trans_cancel(tp); return error; } @@ -3867,13 +3867,13 @@ xlog_recover_clear_agi_bucket( xfs_trans_log_buf(tp, agibp, offset, (offset + sizeof(xfs_agino_t) - 1)); - error = xfs_trans_commit(tp, 0); + error = xfs_trans_commit(tp); if (error) goto out_error; return; out_abort: - xfs_trans_cancel(tp, XFS_TRANS_ABORT); + xfs_trans_cancel(tp); out_error: xfs_warn(mp, "%s: failed to clear agi %d. Continuing.", __func__, agno); return; |