diff options
| author | Jie Liu <jeff.liu@oracle.com> | 2014-02-07 15:26:07 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-02-07 15:26:07 +1100 |
| commit | c6f9726444c8f8c7df24950864bf1a4cb2c61b3e (patch) | |
| tree | 96ff5e5c909215e3b1c8e35a57e595b939027e39 /fs/xfs/xfs_trans.c | |
| parent | 410b11a675dca827e893f07c3155691eda3b5887 (diff) | |
| download | op-kernel-dev-c6f9726444c8f8c7df24950864bf1a4cb2c61b3e.zip op-kernel-dev-c6f9726444c8f8c7df24950864bf1a4cb2c61b3e.tar.gz | |
xfs: convert xfs_log_commit_cil() to void
Convert xfs_log_commit_cil() to a void function since it return nothing
but 0 in any case, after that we can simplify the relative code logic
in xfs_trans_commit() accordingly.
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
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 c812c5c0..54a5732 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -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); |
