summaryrefslogtreecommitdiff
blob: 54df786d948e7b4ede77f0419f5eac33d0a7a17b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
--- ./drivers/scsi/qla4xxx/ql4_init.c.qlafix	2005-10-29 19:09:50.000000000 +0400
+++ ./drivers/scsi/qla4xxx/ql4_init.c	2005-10-31 10:00:49.000000000 +0300
@@ -2920,21 +2920,23 @@
 				lun_entry = tgt_entry->olun[lun];
 				if (lun_entry != NULL) {
 					unsigned long cpu_flags;
+					uint16_t retry_count;
 
 					spin_lock_irqsave(&lun_entry->lun_lock,
 					    cpu_flags);
 
+#ifndef CONFIG_SCSI_QLA4XXX_USE_KERNELQ
+					retry_count = ha->retry_srb_q_count;
+#else
+					retry_count = 0;
+#endif
 					QL4PRINT(QLP4, printk(
 					    "scsi%d:%d:%d:%d: %s: flushing "
 					    "srbs, pendq_cnt=%d, retryq_cnt="
 					    "%d, activeq_cnt=%d\n", ha->host_no,
 					    ddb_entry->bus, tgt_entry->id, lun,
 					    __func__, 0 ,
-#ifndef CONFIG_SCSI_QLA4XXX_USE_KERNELQ
-					    ha->retry_srb_q_count,
-#else
-						0,
-#endif
+					    retry_count,
 					    ha->active_srb_count));
 
 					qla4xxx_flush_all_srbs(ha, ddb_entry,