diff options
Diffstat (limited to 'fs/xfs/xfs_trans.c')
| -rw-r--r-- | fs/xfs/xfs_trans.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index c812c5c060de..54a57326d85b 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c | |||
| @@ -887,12 +887,7 @@ xfs_trans_commit( | |||
| 887 | xfs_trans_apply_sb_deltas(tp); | 887 | xfs_trans_apply_sb_deltas(tp); |
| 888 | xfs_trans_apply_dquot_deltas(tp); | 888 | xfs_trans_apply_dquot_deltas(tp); |
| 889 | 889 | ||
| 890 | error = xfs_log_commit_cil(mp, tp, &commit_lsn, flags); | 890 | xfs_log_commit_cil(mp, tp, &commit_lsn, flags); |
| 891 | if (error == ENOMEM) { | ||
| 892 | xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR); | ||
| 893 | error = XFS_ERROR(EIO); | ||
| 894 | goto out_unreserve; | ||
| 895 | } | ||
| 896 | 891 | ||
| 897 | current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS); | 892 | current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS); |
| 898 | xfs_trans_free(tp); | 893 | xfs_trans_free(tp); |
| @@ -902,10 +897,7 @@ xfs_trans_commit( | |||
| 902 | * log out now and wait for it. | 897 | * log out now and wait for it. |
| 903 | */ | 898 | */ |
| 904 | if (sync) { | 899 | if (sync) { |
| 905 | if (!error) { | 900 | error = _xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL); |
| 906 | error = _xfs_log_force_lsn(mp, commit_lsn, | ||
| 907 | XFS_LOG_SYNC, NULL); | ||
| 908 | } | ||
| 909 | XFS_STATS_INC(xs_trans_sync); | 901 | XFS_STATS_INC(xs_trans_sync); |
| 910 | } else { | 902 | } else { |
| 911 | XFS_STATS_INC(xs_trans_async); | 903 | XFS_STATS_INC(xs_trans_async); |
