From 7cb475ca57f057a0ac1dcc67d16b8929b4ac1527 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 22 May 2010 07:30:27 +0000 Subject: [PATCH] Whitespace-only changes in order to fix the 2.6.34 checkpatch complaints about whitespace. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1706 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- fcst/fcst.h | 4 ++-- iscsi-scst/README | 30 +++++++++++++++--------------- iscsi-scst/README_in-tree | 4 ++-- scst/include/scst_debug.h | 8 ++++---- scst/src/dev_handlers/scst_cdrom.c | 12 ++++++------ scst/src/dev_handlers/scst_vdisk.c | 6 +++--- scst/src/scst_priv.h | 2 +- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/fcst/fcst.h b/fcst/fcst.h index 98ff0af0c..0ebcc59c7 100644 --- a/fcst/fcst.h +++ b/fcst/fcst.h @@ -35,10 +35,10 @@ extern unsigned int ft_debug_logging; /* debug options */ -#define FT_ERR(fmt, args...) \ +#define FT_ERR(fmt, args...) \ printk(KERN_ERR FT_MODULE ": %s: " fmt, __func__, ##args) -#define FT_DEBUG(mask, fmt, args...) \ +#define FT_DEBUG(mask, fmt, args...) \ do { \ if (ft_debug_logging & (mask)) \ printk(KERN_INFO FT_MODULE ": %s: " fmt, \ diff --git a/iscsi-scst/README b/iscsi-scst/README index 4517ab358..e8bfe7288 100644 --- a/iscsi-scst/README +++ b/iscsi-scst/README @@ -339,19 +339,19 @@ echo "add disk1 0" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt/ echo "add cdrom 1" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt/luns/mgmt echo "add_target iqn.2006-10.net.vlnb:tgt1" >/sys/kernel/scst_tgt/targets/iscsi/mgmt -echo "add_target_attribute iqn.2006-10.net.vlnb:tgt1 IncomingUser1 joe2 12charsecret2" >/sys/kernel/scst_tgt/targets/iscsi/mgmt -echo "add_target_attribute iqn.2006-10.net.vlnb:tgt1 IncomingUser joe 12charsecret" >/sys/kernel/scst_tgt/targets/iscsi/mgmt -echo "add_target_attribute iqn.2006-10.net.vlnb:tgt1 OutgoingUser jim1 12charpasswd" >/sys/kernel/scst_tgt/targets/iscsi/mgmt -echo "No" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/InitialR2T -echo "Yes" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/ImmediateData -echo "8192" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxRecvDataSegmentLength -echo "8192" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxXmitDataSegmentLength -echo "131072" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxBurstLength -echo "32768" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/FirstBurstLength -echo "1" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxOutstandingR2T -echo "CRC32C,None" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/HeaderDigest -echo "CRC32C,None" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/DataDigest -echo "32" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/QueuedCommands +echo "add_target_attribute iqn.2006-10.net.vlnb:tgt1 IncomingUser1 joe2 12charsecret2" >/sys/kernel/scst_tgt/targets/iscsi/mgmt +echo "add_target_attribute iqn.2006-10.net.vlnb:tgt1 IncomingUser joe 12charsecret" >/sys/kernel/scst_tgt/targets/iscsi/mgmt +echo "add_target_attribute iqn.2006-10.net.vlnb:tgt1 OutgoingUser jim1 12charpasswd" >/sys/kernel/scst_tgt/targets/iscsi/mgmt +echo "No" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/InitialR2T +echo "Yes" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/ImmediateData +echo "8192" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxRecvDataSegmentLength +echo "8192" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxXmitDataSegmentLength +echo "131072" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxBurstLength +echo "32768" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/FirstBurstLength +echo "1" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/MaxOutstandingR2T +echo "CRC32C,None" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/HeaderDigest +echo "CRC32C,None" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/DataDigest +echo "32" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/QueuedCommands echo "add disk2 0" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/luns/mgmt echo "add nullio 26" >/sys/kernel/scst_tgt/targets/iscsi/iqn.2006-10.net.vlnb:tgt1/luns/mgmt @@ -627,11 +627,11 @@ echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal 10.170.77.2' echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal 10.170.75.2' >/sys/kernel/scst_tgt/targets/iscsi/mgmt will enable only portals 10.170.77.2 and 10.170.75.2 and disable all -other portals. +other portals. echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal 10.170.7?.2' >/sys/kernel/scst_tgt/targets/iscsi/mgmt -will enable only portals 10.170.7x.2 and disable all other portals. +will enable only portals 10.170.7x.2 and disable all other portals. echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal !*' >/sys/kernel/scst_tgt/targets/iscsi/mgmt diff --git a/iscsi-scst/README_in-tree b/iscsi-scst/README_in-tree index 1e44f158a..535a49644 100644 --- a/iscsi-scst/README_in-tree +++ b/iscsi-scst/README_in-tree @@ -524,11 +524,11 @@ echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal 10.170.77.2' echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal 10.170.75.2' >/sys/kernel/scst_tgt/targets/iscsi/mgmt will enable only portals 10.170.77.2 and 10.170.75.2 and disable all -other portals. +other portals. echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal 10.170.7?.2' >/sys/kernel/scst_tgt/targets/iscsi/mgmt -will enable only portals 10.170.7x.2 and disable all other portals. +will enable only portals 10.170.7x.2 and disable all other portals. echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal !*' >/sys/kernel/scst_tgt/targets/iscsi/mgmt diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h index ab99a28fa..ebe9d5770 100644 --- a/scst/include/scst_debug.h +++ b/scst/include/scst_debug.h @@ -66,7 +66,7 @@ typeof(condition) __ret_warn_once = (condition); \ \ if (unlikely(__ret_warn_once)) \ - if (!__warned) { \ + if (!__warned) { \ WARN_ON(1); \ __warned = 1; \ } \ @@ -355,7 +355,7 @@ do { \ #else -#define PRINT_INFO(format, args...) \ +#define PRINT_INFO(format, args...) \ do { \ PRINT(KERN_INFO, format, args); \ } while (0) @@ -366,9 +366,9 @@ do { \ format, args); \ } while (0) -#define PRINT_ERROR(format, args...) \ +#define PRINT_ERROR(format, args...) \ do { \ - PRINT(KERN_ERR, "***ERROR***: " \ + PRINT(KERN_ERR, "***ERROR***: " \ format, args); \ } while (0) diff --git a/scst/src/dev_handlers/scst_cdrom.c b/scst/src/dev_handlers/scst_cdrom.c index 447c85bde..64c464e9d 100644 --- a/scst/src/dev_handlers/scst_cdrom.c +++ b/scst/src/dev_handlers/scst_cdrom.c @@ -40,14 +40,14 @@ static int cdrom_parse(struct scst_cmd *); static int cdrom_done(struct scst_cmd *); static struct scst_dev_type cdrom_devtype = { - .name = CDROM_NAME, + .name = CDROM_NAME, .type = TYPE_ROM, .parse_atomic = 1, - .dev_done_atomic = 1, - .attach = cdrom_attach, - .detach = cdrom_detach, - .parse = cdrom_parse, - .dev_done = cdrom_done, + .dev_done_atomic = 1, + .attach = cdrom_attach, + .detach = cdrom_detach, + .parse = cdrom_parse, + .dev_done = cdrom_done, #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) .default_trace_flags = SCST_DEFAULT_DEV_LOG_FLAGS, .trace_flags = &trace_flag, diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 56dd7b928..f54facdbc 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -1523,7 +1523,7 @@ static int vdisk_err_recov_pg(unsigned char *p, int pcontrol, static int vdisk_disconnect_pg(unsigned char *p, int pcontrol, struct scst_vdisk_dev *virt_dev) -{ /* Disconnect-Reconnect page for mode_sense */ +{ /* Disconnect-Reconnect page for mode_sense */ const unsigned char disconnect_pg[] = {0x2, 0xe, 128, 128, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; @@ -1579,7 +1579,7 @@ static int vdisk_format_pg(unsigned char *p, int pcontrol, static int vdisk_caching_pg(unsigned char *p, int pcontrol, struct scst_vdisk_dev *virt_dev) -{ /* Caching page for mode_sense */ +{ /* Caching page for mode_sense */ const unsigned char caching_pg[] = {0x8, 18, 0x10, 0, 0xff, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x80, 0x14, 0, 0, 0, 0, 0, 0}; @@ -1592,7 +1592,7 @@ static int vdisk_caching_pg(unsigned char *p, int pcontrol, static int vdisk_ctrl_m_pg(unsigned char *p, int pcontrol, struct scst_vdisk_dev *virt_dev) -{ /* Control mode page for mode_sense */ +{ /* Control mode page for mode_sense */ const unsigned char ctrl_m_pg[] = {0xa, 0xa, 0, 0, 0, 0, 0, 0, 0, 0, 0x2, 0x4b}; diff --git a/scst/src/scst_priv.h b/scst/src/scst_priv.h index 760bf91b6..e12e257d4 100644 --- a/scst/src/scst_priv.h +++ b/scst/src/scst_priv.h @@ -127,7 +127,7 @@ extern unsigned long scst_trace_flag; /* Definitions of symbolic constants for LUN addressing method */ #define SCST_LUN_ADDR_METHOD_PERIPHERAL 0 -#define SCST_LUN_ADDR_METHOD_FLAT 1 +#define SCST_LUN_ADDR_METHOD_FLAT 1 extern int scst_threads;