diff options
author | Brian Foster <bfoster@redhat.com> | 2017-06-14 21:29:48 -0700 |
---|---|---|
committer | Darrick J. Wong <darrick.wong@oracle.com> | 2017-06-19 08:59:10 -0700 |
commit | 7d2d5653460443e0586bd7d2e07811b4f4095e36 (patch) | |
tree | 106f891a82acaab052b65413940e1e8d3d1ced97 /fs/xfs/xfs_log_cil.c | |
parent | 1040960efaabb8e6c87633c7becbb51fc99d4b9b (diff) | |
download | linux-7d2d5653460443e0586bd7d2e07811b4f4095e36.tar.gz linux-7d2d5653460443e0586bd7d2e07811b4f4095e36.tar.bz2 linux-7d2d5653460443e0586bd7d2e07811b4f4095e36.zip |
xfs: separate shutdown from ticket reservation print helper
xlog_print_tic_res() pre-dates delayed logging and the committed
items list (CIL) and thus retains some factoring warts, such as hard
coded function names in the output and the fact that it induces a
shutdown.
In preparation for more detailed logging of regular transaction
overrun situations, refactor xlog_print_tic_res() to be slightly
more generic. Reword some of the warning messages and pull the
shutdown into the callers.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')
-rw-r--r-- | fs/xfs/xfs_log_cil.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index 82f1cbcc4de1..52fe04229aa6 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -987,8 +987,10 @@ xfs_log_commit_cil( xlog_cil_insert_items(log, tp); /* check we didn't blow the reservation */ - if (tp->t_ticket->t_curr_res < 0) + if (tp->t_ticket->t_curr_res < 0) { xlog_print_tic_res(mp, tp->t_ticket); + xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR); + } tp->t_commit_lsn = cil->xc_ctx->sequence; if (commit_lsn) |