Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 169a7b07 authored by Dave Chinner's avatar Dave Chinner Committed by Alex Elder
Browse files

xfs: clean up log ticket overrun debug output 



Push the error message output when a ticket overrun is detected
into the ticket printing functions. Also remove the debug version
of the code as the production version will still panic just as
effectively on a debug kernel via the panic mask being set.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent c1155410

fs/xfs/xfs_error.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ xfs_cmn_err(int panic_tag, int level, xfs_mount_t *mp, char *fmt, ...) 
	va_list ap;



#ifdef DEBUG

	xfs_panic_mask |= XFS_PTAG_SHUTDOWN_CORRUPT;

	xfs_panic_mask |= (XFS_PTAG_SHUTDOWN_CORRUPT | XFS_PTAG_LOGRES);

#endif



	if (xfs_panic_mask && (xfs_panic_mask & panic_tag)

fs/xfs/xfs_log.c

+5 −14
Original line number Diff line number Diff line
@@ -1645,6 +1645,10 @@ xlog_print_tic_res(xfs_mount_t *mp, xlog_ticket_t *ticket) 
			    "bad-rtype" : res_type_str[r_type-1]),

			    ticket->t_res_arr[i].r_len);

	}



	xfs_cmn_err(XFS_PTAG_LOGRES, CE_ALERT, mp,

		"xfs_log_write: reservation ran out. Need to up reservation");

	xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);

}



/*
@@ -1897,21 +1901,8 @@ xlog_write( 
	*start_lsn = 0;



	len = xlog_write_calc_vec_length(ticket, log_vector);

	if (ticket->t_curr_res < len) {

	if (ticket->t_curr_res < len)

		xlog_print_tic_res(log->l_mp, ticket);

#ifdef DEBUG

		xlog_panic(

	"xfs_log_write: reservation ran out. Need to up reservation");

#else

		/* Customer configurable panic */

		xfs_cmn_err(XFS_PTAG_LOGRES, CE_ALERT, log->l_mp,

	"xfs_log_write: reservation ran out. Need to up reservation");



		/* If we did not panic, shutdown the filesystem */

		xfs_force_shutdown(log->l_mp, SHUTDOWN_CORRUPT_INCORE);

#endif

	}



	ticket->t_curr_res -= len;



	index = 0;