[Open-FCoE] [v4, 1/7] libfcoe: move logging macros into the local libfcoe.h header file

Bhanu Gollapudi bprakash at broadcom.com
Sat Jan 22 07:20:41 UTC 2011


Please ignore these patches from Nithin. These were sent out  by
mistake. These are the same patches Yi sent out.

Thanks,
Bhanu

On Fri, 2011-01-21 at 18:49 -0800, Nithin Nayak Sujir wrote:
> From: Yi Zou <yi.zou at intel.com>
> 
> libfcoe kernel module debug macros will used by the fcoe transport code
> as well when later it gets added.
> 
> Signed-off-by: Yi Zou <yi.zou at intel.com>
> 
> ---
> drivers/scsi/fcoe/libfcoe.c |   22 ++--------------------
>  drivers/scsi/fcoe/libfcoe.h |   25 +++++++++++++++++++++++++
>  2 files changed, 27 insertions(+), 20 deletions(-)
>  create mode 100644 drivers/scsi/fcoe/libfcoe.h
> 
> diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
> index 625c6be..a4757ca 100644
> --- a/drivers/scsi/fcoe/libfcoe.c
> +++ b/drivers/scsi/fcoe/libfcoe.c
> @@ -44,6 +44,8 @@
>  #include <scsi/libfc.h>
>  #include <scsi/libfcoe.h>
>  
> +#include "libfcoe.h"
> +
>  MODULE_AUTHOR("Open-FCoE.org");
>  MODULE_DESCRIPTION("FIP discovery protocol support for FCoE HBAs");
>  MODULE_LICENSE("GPL v2");
> @@ -70,26 +72,6 @@ unsigned int libfcoe_debug_logging;
>  module_param_named(debug_logging, libfcoe_debug_logging, int, S_IRUGO|S_IWUSR);
>  MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");
>  
> -#define LIBFCOE_LOGGING	    0x01 /* General logging, not categorized */
> -#define LIBFCOE_FIP_LOGGING 0x02 /* FIP logging */
> -
> -#define LIBFCOE_CHECK_LOGGING(LEVEL, CMD)		\
> -do {							\
> -	if (unlikely(libfcoe_debug_logging & LEVEL))	\
> -		do {					\
> -			CMD;				\
> -		} while (0);				\
> -} while (0)
> -
> -#define LIBFCOE_DBG(fmt, args...)					\
> -	LIBFCOE_CHECK_LOGGING(LIBFCOE_LOGGING,				\
> -			      printk(KERN_INFO "libfcoe: " fmt, ##args);)
> -
> -#define LIBFCOE_FIP_DBG(fip, fmt, args...)				\
> -	LIBFCOE_CHECK_LOGGING(LIBFCOE_FIP_LOGGING,			\
> -			      printk(KERN_INFO "host%d: fip: " fmt, 	\
> -				     (fip)->lp->host->host_no, ##args);)
> -
>  static const char *fcoe_ctlr_states[] = {
>  	[FIP_ST_DISABLED] =	"DISABLED",
>  	[FIP_ST_LINK_WAIT] =	"LINK_WAIT",
> diff --git a/drivers/scsi/fcoe/libfcoe.h b/drivers/scsi/fcoe/libfcoe.h
> new file mode 100644
> index 0000000..c3fe316
> --- /dev/null
> +++ b/drivers/scsi/fcoe/libfcoe.h
> @@ -0,0 +1,25 @@
> +#ifndef _FCOE_LIBFCOE_H_
> +#define _FCOE_LIBFCOE_H_
> +
> +extern unsigned int libfcoe_debug_logging;
> +#define LIBFCOE_LOGGING	    0x01 /* General logging, not categorized */
> +#define LIBFCOE_FIP_LOGGING 0x02 /* FIP logging */
> +
> +#define LIBFCOE_CHECK_LOGGING(LEVEL, CMD)		\
> +do {							\
> +	if (unlikely(libfcoe_debug_logging & LEVEL))	\
> +		do {					\
> +			CMD;				\
> +		} while (0);				\
> +} while (0)
> +
> +#define LIBFCOE_DBG(fmt, args...)					\
> +	LIBFCOE_CHECK_LOGGING(LIBFCOE_LOGGING,				\
> +			      printk(KERN_INFO "libfcoe: " fmt, ##args);)
> +
> +#define LIBFCOE_FIP_DBG(fip, fmt, args...)				\
> +	LIBFCOE_CHECK_LOGGING(LIBFCOE_FIP_LOGGING,			\
> +			      printk(KERN_INFO "host%d: fip: " fmt,	\
> +				     (fip)->lp->host->host_no, ##args);)
> +
> +#endif /* _FCOE_LIBFCOE_H_ */






More information about the devel mailing list