[SCSI] iscsi_tcp: use iscsi_conn_get_addr_param libiscsi function

[linux.git] / fs / xfs / support / debug.c

diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index e6cf955ec0fca16f714812e9edef6c6c150a7762..0df88897ef8442da776f726960c6b2a9deece178 100644 (file)
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -75,11 +75,11 @@ xfs_cmn_err(
 {
        struct va_format        vaf;
        va_list                 args;
-       int                     panic = 0;
+       int                     do_panic = 0;
 
        if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
                printk(KERN_ALERT "XFS: Transforming an alert into a BUG.");
-               panic = 1;
+               do_panic = 1;
        }
 
        va_start(args, fmt);
@@ -89,7 +89,7 @@ xfs_cmn_err(
        printk(KERN_ALERT "Filesystem %s: %pV", mp->m_fsname, &vaf);
        va_end(args);
 
-       BUG_ON(panic);
+       BUG_ON(do_panic);
 }
 
 void