From 0c9ba97318fc9a905bcc1419b6966de061203a70 Mon Sep 17 00:00:00 2001
From: Alex Elder <aelder@sgi.com>
Date: Fri, 11 Mar 2011 12:39:51 +0000
Subject: [PATCH] xfs: don't name variables "panic"
The new xfs_alert_tag() used a variable named "panic",
and that is to be avoided. Rename it.
Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/linux-2.6/xfs_message.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/linux-2.6/xfs_message.c b/fs/xfs/linux-2.6/xfs_message.c
index 8fe8cf69d809d..508e06fd7d1e6 100644
--- a/fs/xfs/linux-2.6/xfs_message.c
+++ b/fs/xfs/linux-2.6/xfs_message.c
@@ -96,13 +96,13 @@ xfs_alert_tag(
{
struct va_format vaf;
va_list args;
- int panic = 0;
- int r;
+ int do_panic = 0;
+ int r;
if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
xfs_printk(KERN_ALERT, mp,
"XFS: Transforming an alert into a BUG.");
- panic = 1;
+ do_panic = 1;
}
va_start(args, fmt);
@@ -113,7 +113,7 @@ xfs_alert_tag(
r = __xfs_printk(KERN_ALERT, mp, &vaf);
va_end(args);
- BUG_ON(panic);
+ BUG_ON(do_panic);
return r;
}
--
GitLab