aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJayamohan Kallickal <jayamohank@gmail.com>2013-09-28 18:35:55 -0400
committerJames Bottomley <JBottomley@Parallels.com>2013-10-25 04:58:09 -0400
commitafb9605844d117276532aabc5087e9fc3c0a08d2 (patch)
tree66df4c9fbc780b40fcda6ea87640478e17928148
parent68c26a3afc6693d08181c1757f943bd005d03c2f (diff)
[SCSI] be2iscsi: Fix log level for protocol specific logs
Signed-off-by: John Soni Jose <sony.john-n@emulex.com> Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/be2iscsi/be_main.c11
-rw-r--r--drivers/scsi/be2iscsi/be_main.h1
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index ddacd2c99079..7e470a322e35 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -149,7 +149,8 @@ BEISCSI_RW_ATTR(log_enable, 0x00,
149 "\t\t\t\tMiscellaneous Events : 0x04\n" 149 "\t\t\t\tMiscellaneous Events : 0x04\n"
150 "\t\t\t\tError Handling : 0x08\n" 150 "\t\t\t\tError Handling : 0x08\n"
151 "\t\t\t\tIO Path Events : 0x10\n" 151 "\t\t\t\tIO Path Events : 0x10\n"
152 "\t\t\t\tConfiguration Path : 0x20\n"); 152 "\t\t\t\tConfiguration Path : 0x20\n"
153 "\t\t\t\tiSCSI Protocol : 0x40\n");
153 154
154DEVICE_ATTR(beiscsi_drvr_ver, S_IRUGO, beiscsi_drvr_ver_disp, NULL); 155DEVICE_ATTR(beiscsi_drvr_ver, S_IRUGO, beiscsi_drvr_ver_disp, NULL);
155DEVICE_ATTR(beiscsi_adapter_family, S_IRUGO, beiscsi_adap_family_disp, NULL); 156DEVICE_ATTR(beiscsi_adapter_family, S_IRUGO, beiscsi_adap_family_disp, NULL);
@@ -5019,8 +5020,12 @@ static int beiscsi_task_xmit(struct iscsi_task *task)
5019 struct beiscsi_hba *phba = NULL; 5020 struct beiscsi_hba *phba = NULL;
5020 5021
5021 phba = ((struct beiscsi_conn *)conn->dd_data)->phba; 5022 phba = ((struct beiscsi_conn *)conn->dd_data)->phba;
5022 beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_IO, 5023 beiscsi_log(phba, KERN_ERR,
5023 "BM_%d : scsi_dma_map Failed\n"); 5024 BEISCSI_LOG_IO | BEISCSI_LOG_ISCSI,
5025 "BM_%d : scsi_dma_map Failed "
5026 "Driver_ITT : 0x%x ITT : 0x%x Xferlen : 0x%x\n",
5027 be32_to_cpu(io_task->cmd_bhs->iscsi_hdr.itt),
5028 io_task->libiscsi_itt, scsi_bufflen(sc));
5024 5029
5025 return num_sg; 5030 return num_sg;
5026 } 5031 }
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 88291b0051bf..a8ae6b82c3e1 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -1040,6 +1040,7 @@ struct hwi_context_memory {
1040#define BEISCSI_LOG_EH 0x0008 /* Error Handler */ 1040#define BEISCSI_LOG_EH 0x0008 /* Error Handler */
1041#define BEISCSI_LOG_IO 0x0010 /* IO Code Path */ 1041#define BEISCSI_LOG_IO 0x0010 /* IO Code Path */
1042#define BEISCSI_LOG_CONFIG 0x0020 /* CONFIG Code Path */ 1042#define BEISCSI_LOG_CONFIG 0x0020 /* CONFIG Code Path */
1043#define BEISCSI_LOG_ISCSI 0x0040 /* SCSI/iSCSI Protocol related Logs */
1043 1044
1044#define beiscsi_log(phba, level, mask, fmt, arg...) \ 1045#define beiscsi_log(phba, level, mask, fmt, arg...) \
1045do { \ 1046do { \