fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / scsi / scsi_logging.h

diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h
index e1722ba..1f65139 100644 (file)
--- a/drivers/scsi/scsi_logging.h
+++ b/drivers/scsi/scsi_logging.h
@@ -1,7 +1,6 @@
 #ifndef _SCSI_LOGGING_H
 #define _SCSI_LOGGING_H
 
-#include <linux/config.h>
 
 /*
  * This defines the scsi logging feature.  It is a means by which the user
@@ -45,10 +44,12 @@ extern unsigned int scsi_logging_level;
         ((scsi_logging_level >> (SHIFT)) & ((1 << (BITS)) - 1))
 
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)            \
-{                                                              \
+do {                                                           \
         if (unlikely((SCSI_LOG_LEVEL(SHIFT, BITS)) > (LEVEL))) \
-               (CMD);                                          \
-}
+               do {                                            \
+                       CMD;                                    \
+               } while (0);                                    \
+} while (0)
 #else
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)
 #endif /* CONFIG_SCSI_LOGGING */