mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-17 10:41:26 +00:00
Whitespace-only changes: addressed most whitespace complaints reported by the 2.6.36 checkpatch tool.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2431 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -3787,13 +3787,13 @@ static int iscsi_target_release(struct scst_tgt *scst_tgt)
|
||||
#if !defined(CONFIG_SCST_PROC) && \
|
||||
(defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING))
|
||||
static struct scst_trace_log iscsi_local_trace_tbl[] = {
|
||||
{ TRACE_D_WRITE, "d_write" },
|
||||
{ TRACE_CONN_OC, "conn" },
|
||||
{ TRACE_CONN_OC_DBG, "conn_dbg" },
|
||||
{ TRACE_D_IOV, "iov" },
|
||||
{ TRACE_D_DUMP_PDU, "pdu" },
|
||||
{ TRACE_NET_PG, "net_page" },
|
||||
{ 0, NULL }
|
||||
{ TRACE_D_WRITE, "d_write" },
|
||||
{ TRACE_CONN_OC, "conn" },
|
||||
{ TRACE_CONN_OC_DBG, "conn_dbg" },
|
||||
{ TRACE_D_IOV, "iov" },
|
||||
{ TRACE_D_DUMP_PDU, "pdu" },
|
||||
{ TRACE_NET_PG, "net_page" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
#define ISCSI_TRACE_TBL_HELP ", d_write, conn, conn_dbg, iov, pdu, net_page"
|
||||
|
||||
@@ -56,8 +56,8 @@
|
||||
#define TRACE_ORDER 0x80000000
|
||||
|
||||
static struct scst_trace_log vdisk_local_trace_tbl[] = {
|
||||
{ TRACE_ORDER, "order" },
|
||||
{ 0, NULL }
|
||||
{ TRACE_ORDER, "order" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
#define trace_log_tbl vdisk_local_trace_tbl
|
||||
|
||||
@@ -2998,8 +2998,8 @@ static int blockio_flush(struct block_device *bdev)
|
||||
TRACE_ENTRY();
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) \
|
||||
&& !(defined(CONFIG_SUSE_KERNEL) \
|
||||
&& LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 34))
|
||||
&& !(defined(CONFIG_SUSE_KERNEL) \
|
||||
&& LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 34))
|
||||
res = blkdev_issue_flush(bdev, NULL);
|
||||
#else
|
||||
res = blkdev_issue_flush(bdev, GFP_KERNEL, NULL, BLKDEV_IFL_WAIT);
|
||||
|
||||
@@ -101,35 +101,35 @@ static struct proc_dir_entry *scst_proc_groups_root;
|
||||
static struct scst_proc_data scst_log_proc_data;
|
||||
|
||||
static struct scst_trace_log scst_proc_trace_tbl[] = {
|
||||
{ TRACE_OUT_OF_MEM, "out_of_mem" },
|
||||
{ TRACE_MINOR, "minor" },
|
||||
{ TRACE_SG_OP, "sg" },
|
||||
{ TRACE_MEMORY, "mem" },
|
||||
{ TRACE_BUFF, "buff" },
|
||||
{ TRACE_OUT_OF_MEM, "out_of_mem" },
|
||||
{ TRACE_MINOR, "minor" },
|
||||
{ TRACE_SG_OP, "sg" },
|
||||
{ TRACE_MEMORY, "mem" },
|
||||
{ TRACE_BUFF, "buff" },
|
||||
#ifndef GENERATING_UPSTREAM_PATCH
|
||||
{ TRACE_ENTRYEXIT, "entryexit" },
|
||||
{ TRACE_ENTRYEXIT, "entryexit" },
|
||||
#endif
|
||||
{ TRACE_PID, "pid" },
|
||||
{ TRACE_LINE, "line" },
|
||||
{ TRACE_FUNCTION, "function" },
|
||||
{ TRACE_DEBUG, "debug" },
|
||||
{ TRACE_SPECIAL, "special" },
|
||||
{ TRACE_SCSI, "scsi" },
|
||||
{ TRACE_MGMT, "mgmt" },
|
||||
{ TRACE_MGMT_DEBUG, "mgmt_dbg" },
|
||||
{ TRACE_FLOW_CONTROL, "flow_control" },
|
||||
{ TRACE_PRES, "pr" },
|
||||
{ 0, NULL }
|
||||
{ TRACE_PID, "pid" },
|
||||
{ TRACE_LINE, "line" },
|
||||
{ TRACE_FUNCTION, "function" },
|
||||
{ TRACE_DEBUG, "debug" },
|
||||
{ TRACE_SPECIAL, "special" },
|
||||
{ TRACE_SCSI, "scsi" },
|
||||
{ TRACE_MGMT, "mgmt" },
|
||||
{ TRACE_MGMT_DEBUG, "mgmt_dbg" },
|
||||
{ TRACE_FLOW_CONTROL, "flow_control" },
|
||||
{ TRACE_PRES, "pr" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static struct scst_trace_log scst_proc_local_trace_tbl[] = {
|
||||
{ TRACE_RTRY, "retry" },
|
||||
{ TRACE_SCSI_SERIALIZING, "scsi_serializing" },
|
||||
{ TRACE_RCV_BOT, "recv_bot" },
|
||||
{ TRACE_SND_BOT, "send_bot" },
|
||||
{ TRACE_RCV_TOP, "recv_top" },
|
||||
{ TRACE_SND_TOP, "send_top" },
|
||||
{ 0, NULL }
|
||||
{ TRACE_RTRY, "retry" },
|
||||
{ TRACE_SCSI_SERIALIZING, "scsi_serializing" },
|
||||
{ TRACE_RCV_BOT, "recv_bot" },
|
||||
{ TRACE_SND_BOT, "send_bot" },
|
||||
{ TRACE_RCV_TOP, "recv_top" },
|
||||
{ TRACE_SND_TOP, "send_top" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -172,22 +172,22 @@ static char *scst_proc_help_string =
|
||||
;
|
||||
|
||||
static char *scst_proc_dev_handler_type[] = {
|
||||
"Direct-access device (e.g., magnetic disk)",
|
||||
"Sequential-access device (e.g., magnetic tape)",
|
||||
"Printer device",
|
||||
"Processor device",
|
||||
"Write-once device (e.g., some optical disks)",
|
||||
"CD-ROM device",
|
||||
"Scanner device (obsolete)",
|
||||
"Optical memory device (e.g., some optical disks)",
|
||||
"Medium changer device (e.g., jukeboxes)",
|
||||
"Communications device (obsolete)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Storage array controller device (e.g., RAID)",
|
||||
"Enclosure services device",
|
||||
"Simplified direct-access device (e.g., magnetic disk)",
|
||||
"Optical card reader/writer device"
|
||||
"Direct-access device (e.g., magnetic disk)",
|
||||
"Sequential-access device (e.g., magnetic tape)",
|
||||
"Printer device",
|
||||
"Processor device",
|
||||
"Write-once device (e.g., some optical disks)",
|
||||
"CD-ROM device",
|
||||
"Scanner device (obsolete)",
|
||||
"Optical memory device (e.g., some optical disks)",
|
||||
"Medium changer device (e.g., jukeboxes)",
|
||||
"Communications device (obsolete)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Storage array controller device (e.g., RAID)",
|
||||
"Enclosure services device",
|
||||
"Simplified direct-access device (e.g., magnetic disk)",
|
||||
"Optical card reader/writer device"
|
||||
};
|
||||
|
||||
static DEFINE_MUTEX(scst_proc_mutex);
|
||||
|
||||
@@ -43,22 +43,22 @@ static struct kobject *scst_sgv_kobj;
|
||||
static struct kobject *scst_handlers_kobj;
|
||||
|
||||
static const char *scst_dev_handler_types[] = {
|
||||
"Direct-access device (e.g., magnetic disk)",
|
||||
"Sequential-access device (e.g., magnetic tape)",
|
||||
"Printer device",
|
||||
"Processor device",
|
||||
"Write-once device (e.g., some optical disks)",
|
||||
"CD-ROM device",
|
||||
"Scanner device (obsolete)",
|
||||
"Optical memory device (e.g., some optical disks)",
|
||||
"Medium changer device (e.g., jukeboxes)",
|
||||
"Communications device (obsolete)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Storage array controller device (e.g., RAID)",
|
||||
"Enclosure services device",
|
||||
"Simplified direct-access device (e.g., magnetic disk)",
|
||||
"Optical card reader/writer device"
|
||||
"Direct-access device (e.g., magnetic disk)",
|
||||
"Sequential-access device (e.g., magnetic tape)",
|
||||
"Printer device",
|
||||
"Processor device",
|
||||
"Write-once device (e.g., some optical disks)",
|
||||
"CD-ROM device",
|
||||
"Scanner device (obsolete)",
|
||||
"Optical memory device (e.g., some optical disks)",
|
||||
"Medium changer device (e.g., jukeboxes)",
|
||||
"Communications device (obsolete)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Defined by ASC IT8 (Graphic arts pre-press devices)",
|
||||
"Storage array controller device (e.g., RAID)",
|
||||
"Enclosure services device",
|
||||
"Simplified direct-access device (e.g., magnetic disk)",
|
||||
"Optical card reader/writer device"
|
||||
};
|
||||
|
||||
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
|
||||
@@ -66,35 +66,35 @@ static const char *scst_dev_handler_types[] = {
|
||||
static DEFINE_MUTEX(scst_log_mutex);
|
||||
|
||||
static struct scst_trace_log scst_trace_tbl[] = {
|
||||
{ TRACE_OUT_OF_MEM, "out_of_mem" },
|
||||
{ TRACE_MINOR, "minor" },
|
||||
{ TRACE_SG_OP, "sg" },
|
||||
{ TRACE_MEMORY, "mem" },
|
||||
{ TRACE_BUFF, "buff" },
|
||||
{ TRACE_OUT_OF_MEM, "out_of_mem" },
|
||||
{ TRACE_MINOR, "minor" },
|
||||
{ TRACE_SG_OP, "sg" },
|
||||
{ TRACE_MEMORY, "mem" },
|
||||
{ TRACE_BUFF, "buff" },
|
||||
#ifndef GENERATING_UPSTREAM_PATCH
|
||||
{ TRACE_ENTRYEXIT, "entryexit" },
|
||||
{ TRACE_ENTRYEXIT, "entryexit" },
|
||||
#endif
|
||||
{ TRACE_PID, "pid" },
|
||||
{ TRACE_LINE, "line" },
|
||||
{ TRACE_FUNCTION, "function" },
|
||||
{ TRACE_DEBUG, "debug" },
|
||||
{ TRACE_SPECIAL, "special" },
|
||||
{ TRACE_SCSI, "scsi" },
|
||||
{ TRACE_MGMT, "mgmt" },
|
||||
{ TRACE_MGMT_DEBUG, "mgmt_dbg" },
|
||||
{ TRACE_FLOW_CONTROL, "flow_control" },
|
||||
{ TRACE_PRES, "pr" },
|
||||
{ 0, NULL }
|
||||
{ TRACE_PID, "pid" },
|
||||
{ TRACE_LINE, "line" },
|
||||
{ TRACE_FUNCTION, "function" },
|
||||
{ TRACE_DEBUG, "debug" },
|
||||
{ TRACE_SPECIAL, "special" },
|
||||
{ TRACE_SCSI, "scsi" },
|
||||
{ TRACE_MGMT, "mgmt" },
|
||||
{ TRACE_MGMT_DEBUG, "mgmt_dbg" },
|
||||
{ TRACE_FLOW_CONTROL, "flow_control" },
|
||||
{ TRACE_PRES, "pr" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static struct scst_trace_log scst_local_trace_tbl[] = {
|
||||
{ TRACE_RTRY, "retry" },
|
||||
{ TRACE_SCSI_SERIALIZING, "scsi_serializing" },
|
||||
{ TRACE_RCV_BOT, "recv_bot" },
|
||||
{ TRACE_SND_BOT, "send_bot" },
|
||||
{ TRACE_RCV_TOP, "recv_top" },
|
||||
{ TRACE_SND_TOP, "send_top" },
|
||||
{ 0, NULL }
|
||||
{ TRACE_RTRY, "retry" },
|
||||
{ TRACE_SCSI_SERIALIZING, "scsi_serializing" },
|
||||
{ TRACE_RCV_BOT, "recv_bot" },
|
||||
{ TRACE_SND_BOT, "send_bot" },
|
||||
{ TRACE_RCV_TOP, "recv_top" },
|
||||
{ TRACE_SND_TOP, "send_top" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static ssize_t scst_trace_level_show(const struct scst_trace_log *local_tbl,
|
||||
|
||||
Reference in New Issue
Block a user