All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 06/11] xfs: clean up log ticket overrun debug output
Date: Thu,  6 May 2010 11:45:46 +1000	[thread overview]
Message-ID: <1273110351-2333-7-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1273110351-2333-1-git-send-email-david@fromorbit.com>

From: Dave Chinner <dchinner@redhat.com>

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: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/xfs_error.c |    2 +-
 fs/xfs/xfs_log.c   |   19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index ef96175..047b8a8 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -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)
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 83be6a6..1efb303 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -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;
-- 
1.5.6.5

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2010-05-06  1:44 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-06  1:45 [PATCH 0/11] xfs: delayed logging Dave Chinner
2010-05-06  1:45 ` [PATCH 01/11] xfs: Don't reuse the same transaciton ID for duplicated transactions Dave Chinner
2010-05-06 20:41   ` Christoph Hellwig
2010-05-06  1:45 ` [PATCH 02/11] xfs: Improve scalability of busy extent tracking Dave Chinner
2010-05-06  1:45 ` [PATCH 03/11] xfs: allow log ticket allocation to take allocation flags Dave Chinner
2010-05-06 20:43   ` Christoph Hellwig
2010-05-06  1:45 ` [PATCH 04/11] xfs: modify buffer item reference counting V2 Dave Chinner
2010-05-06 21:00   ` Christoph Hellwig
2010-05-06  1:45 ` [PATCH 05/11] xfs: Clean up XFS_BLI_* flag namespace Dave Chinner
2010-05-06 20:51   ` Christoph Hellwig
2010-05-06  1:45 ` Dave Chinner [this message]
2010-05-06 20:50   ` [PATCH 06/11] xfs: clean up log ticket overrun debug output Christoph Hellwig
2010-05-06  1:45 ` [PATCH 07/11] xfs: Delayed logging design documentation Dave Chinner
2010-05-06  1:45 ` [PATCH 08/11] xfs: Introduce delayed logging core code Dave Chinner
2010-05-06  1:45 ` [PATCH 09/11] xfs: forced unmounts need to push the CIL Dave Chinner
2010-05-06  1:45 ` [PATCH 10/11] xfs: enable background pushing of " Dave Chinner
2010-05-06  1:45 ` [PATCH 11/11] xfs: Ensure inode allocation buffers are fully replayed Dave Chinner
2010-05-06 13:26 ` [PATCH 0/11] xfs: delayed logging Dave Chinner
2010-05-06 19:12   ` Christoph Hellwig
2010-05-06 23:54     ` Dave Chinner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1273110351-2333-7-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.