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>
This commit is contained in:
Родитель
410b11a675
Коммит
c6f9726444
|
@ -175,7 +175,7 @@ void xlog_iodone(struct xfs_buf *);
|
||||||
struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket);
|
struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket);
|
||||||
void xfs_log_ticket_put(struct xlog_ticket *ticket);
|
void xfs_log_ticket_put(struct xlog_ticket *ticket);
|
||||||
|
|
||||||
int xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
|
void xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
|
||||||
xfs_lsn_t *commit_lsn, int flags);
|
xfs_lsn_t *commit_lsn, int flags);
|
||||||
bool xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);
|
bool xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);
|
||||||
|
|
||||||
|
|
|
@ -710,7 +710,7 @@ xlog_cil_empty(
|
||||||
* background commit, returns without it held once background commits are
|
* background commit, returns without it held once background commits are
|
||||||
* allowed again.
|
* allowed again.
|
||||||
*/
|
*/
|
||||||
int
|
void
|
||||||
xfs_log_commit_cil(
|
xfs_log_commit_cil(
|
||||||
struct xfs_mount *mp,
|
struct xfs_mount *mp,
|
||||||
struct xfs_trans *tp,
|
struct xfs_trans *tp,
|
||||||
|
@ -756,7 +756,6 @@ xfs_log_commit_cil(
|
||||||
xlog_cil_push_background(log);
|
xlog_cil_push_background(log);
|
||||||
|
|
||||||
up_read(&cil->xc_ctx_lock);
|
up_read(&cil->xc_ctx_lock);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -887,12 +887,7 @@ xfs_trans_commit(
|
||||||
xfs_trans_apply_sb_deltas(tp);
|
xfs_trans_apply_sb_deltas(tp);
|
||||||
xfs_trans_apply_dquot_deltas(tp);
|
xfs_trans_apply_dquot_deltas(tp);
|
||||||
|
|
||||||
error = xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
||||||
xfs_trans_free(tp);
|
xfs_trans_free(tp);
|
||||||
|
@ -902,10 +897,7 @@ xfs_trans_commit(
|
||||||
* log out now and wait for it.
|
* log out now and wait for it.
|
||||||
*/
|
*/
|
||||||
if (sync) {
|
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);
|
XFS_STATS_INC(xs_trans_sync);
|
||||||
} else {
|
} else {
|
||||||
XFS_STATS_INC(xs_trans_async);
|
XFS_STATS_INC(xs_trans_async);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче