From 89e6d2a3fba041a4df9e4edfce37939ba69a3bb7 Mon Sep 17 00:00:00 2001
From: Dave Chinner <dchinner@redhat.com>
Date: Fri, 7 May 2010 11:05:31 +1000
Subject: [PATCH] --- yaml --- r: 198355 b: refs/heads/master c:
 169a7b078eaa765e6bd09865c985298ee9084a89 h: refs/heads/master i:   198353:
 8ca08dbe9920bcd04550ec378809cfd04bb3a87b   198351:
 5224b302f476381a73b556bc70a05b6f43f23273 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/xfs/xfs_error.c |  2 +-
 trunk/fs/xfs/xfs_log.c   | 19 +++++--------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 409d1916f299..5fe95204e4d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c11554104f4dcb509fd43973389b097a04b9d51d
+refs/heads/master: 169a7b078eaa765e6bd09865c985298ee9084a89
diff --git a/trunk/fs/xfs/xfs_error.c b/trunk/fs/xfs/xfs_error.c
index ef96175c0744..047b8a8e5c29 100644
--- a/trunk/fs/xfs/xfs_error.c
+++ b/trunk/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/trunk/fs/xfs/xfs_log.c b/trunk/fs/xfs/xfs_log.c
index 83be6a6aa0dc..1efb303d3aaf 100644
--- a/trunk/fs/xfs/xfs_log.c
+++ b/trunk/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;