aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Love <robert.w.love@intel.com>2009-08-25 16:58:37 -0400
committerJames Bottomley <James.Bottomley@suse.de>2009-09-05 10:47:32 -0400
commitcd305ce41be1615dfc72892e0642c6b880f58d95 (patch)
tree00b863c35c20026da3836b8340156169bca0b259
parentee610c6701875525d5c61fa6e56ddbf3e645b8df (diff)
[SCSI] libfc: Fix misleading debug statement
The statement reads, "Exchange timed out, notifying the upper layer", however, this statement is printed whenever the timer is armed. This is confusing to someone debugging the code because every time an exchange is initialized, there is an incorrect statement stating that the timer has already timed out. This patch changes the statement to read, "Exchange timer armed" which is more accurate. This patch also adds a debug statement in the timeout handler to properly indicate that the exchange has timed out. Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/libfc/fc_exch.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 11ddd115efb..40c34274bd8 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -326,7 +326,7 @@ static inline void fc_exch_timer_set_locked(struct fc_exch *ep,
326 if (ep->state & (FC_EX_RST_CLEANUP | FC_EX_DONE)) 326 if (ep->state & (FC_EX_RST_CLEANUP | FC_EX_DONE))
327 return; 327 return;
328 328
329 FC_EXCH_DBG(ep, "Exchange timed out, notifying the upper layer\n"); 329 FC_EXCH_DBG(ep, "Exchange timer armed\n");
330 330
331 if (schedule_delayed_work(&ep->timeout_work, 331 if (schedule_delayed_work(&ep->timeout_work,
332 msecs_to_jiffies(timer_msec))) 332 msecs_to_jiffies(timer_msec)))
@@ -412,6 +412,8 @@ static void fc_exch_timeout(struct work_struct *work)
412 u32 e_stat; 412 u32 e_stat;
413 int rc = 1; 413 int rc = 1;
414 414
415 FC_EXCH_DBG(ep, "Exchange timed out\n");
416
415 spin_lock_bh(&ep->ex_lock); 417 spin_lock_bh(&ep->ex_lock);
416 if (ep->state & (FC_EX_RST_CLEANUP | FC_EX_DONE)) 418 if (ep->state & (FC_EX_RST_CLEANUP | FC_EX_DONE))
417 goto unlock; 419 goto unlock;