|
@@ -887,12 +887,7 @@ xfs_trans_commit(
|
|
|
xfs_trans_apply_sb_deltas(tp);
|
|
|
xfs_trans_apply_dquot_deltas(tp);
|
|
|
|
|
|
- error = xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
|
|
|
- if (error == ENOMEM) {
|
|
|
- xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);
|
|
|
- error = XFS_ERROR(EIO);
|
|
|
- goto out_unreserve;
|
|
|
- }
|
|
|
+ xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
|
|
|
|
|
|
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
|
|
xfs_trans_free(tp);
|
|
@@ -902,10 +897,7 @@ xfs_trans_commit(
|
|
|
* log out now and wait for it.
|
|
|
*/
|
|
|
if (sync) {
|
|
|
- if (!error) {
|
|
|
- error = _xfs_log_force_lsn(mp, commit_lsn,
|
|
|
- XFS_LOG_SYNC, NULL);
|
|
|
- }
|
|
|
+ error = _xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);
|
|
|
XFS_STATS_INC(xs_trans_sync);
|
|
|
} else {
|
|
|
XFS_STATS_INC(xs_trans_async);
|