1 files changed, 53 insertions, 43 deletions

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 10a6a2a7bfc5..c772d8d27159 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -334,6 +334,52 @@ static void fc_exch_release(struct fc_exch *ep)
 }
 
 /**
+ * fc_exch_timer_cancel() - cancel exch timer
+ * @ep:         The exchange whose timer to be canceled
+ */
+static inline  void fc_exch_timer_cancel(struct fc_exch *ep)
+{
+        if (cancel_delayed_work(&ep->timeout_work)) {
+                FC_EXCH_DBG(ep, "Exchange timer canceled\n");
+                atomic_dec(&ep->ex_refcnt); /* drop hold for timer */
+        }
+}
+
+/**
+ * fc_exch_timer_set_locked() - Start a timer for an exchange w/ the
+ *                              the exchange lock held
+ * @ep:         The exchange whose timer will start
+ * @timer_msec: The timeout period
+ *
+ * Used for upper level protocols to time out the exchange.
+ * The timer is cancelled when it fires or when the exchange completes.
+ */
+static inline void fc_exch_timer_set_locked(struct fc_exch *ep,
+                                            unsigned int timer_msec)
+{
+        if (ep->state & (FC_EX_RST_CLEANUP | FC_EX_DONE))
+                return;
+
+        FC_EXCH_DBG(ep, "Exchange timer armed : %d msecs\n", timer_msec);
+
+        if (queue_delayed_work(fc_exch_workqueue, &ep->timeout_work,
+                               msecs_to_jiffies(timer_msec)))
+                fc_exch_hold(ep);               /* hold for timer */
+}
+
+/**
+ * fc_exch_timer_set() - Lock the exchange and set the timer
+ * @ep:         The exchange whose timer will start
+ * @timer_msec: The timeout period
+ */
+static void fc_exch_timer_set(struct fc_exch *ep, unsigned int timer_msec)
+{
+        spin_lock_bh(&ep->ex_lock);
+        fc_exch_timer_set_locked(ep, timer_msec);
+        spin_unlock_bh(&ep->ex_lock);
+}
+
+/**
  * fc_exch_done_locked() - Complete an exchange with the exchange lock held
  * @ep: The exchange that is complete
  */
@@ -354,8 +400,7 @@ static int fc_exch_done_locked(struct fc_exch *ep)
 
         if (!(ep->esb_stat & ESB_ST_REC_QUAL)) {
                 ep->state |= FC_EX_DONE;
-                if (cancel_delayed_work(&ep->timeout_work))
-                        atomic_dec(&ep->ex_refcnt); /* drop hold for timer */
+                fc_exch_timer_cancel(ep);
                 rc = 0;
         }
         return rc;
@@ -419,40 +464,6 @@ static void fc_exch_delete(struct fc_exch *ep)
 }
 
 /**
- * fc_exch_timer_set_locked() - Start a timer for an exchange w/ the
- *                              the exchange lock held
- * @ep:         The exchange whose timer will start
- * @timer_msec: The timeout period
- *
- * Used for upper level protocols to time out the exchange.
- * The timer is cancelled when it fires or when the exchange completes.
- */
-static inline void fc_exch_timer_set_locked(struct fc_exch *ep,
-                                            unsigned int timer_msec)
-{
-        if (ep->state & (FC_EX_RST_CLEANUP | FC_EX_DONE))
-                return;
-
-        FC_EXCH_DBG(ep, "Exchange timer armed\n");
-
-        if (queue_delayed_work(fc_exch_workqueue, &ep->timeout_work,
-                               msecs_to_jiffies(timer_msec)))
-                fc_exch_hold(ep);               /* hold for timer */
-}
-
-/**
- * fc_exch_timer_set() - Lock the exchange and set the timer
- * @ep:         The exchange whose timer will start
- * @timer_msec: The timeout period
- */
-static void fc_exch_timer_set(struct fc_exch *ep, unsigned int timer_msec)
-{
-        spin_lock_bh(&ep->ex_lock);
-        fc_exch_timer_set_locked(ep, timer_msec);
-        spin_unlock_bh(&ep->ex_lock);
-}
-
-/**
  * fc_seq_send() - Send a frame using existing sequence/exchange pair
  * @lport: The local port that the exchange will be sent on
  * @sp:    The sequence to be sent
@@ -1544,8 +1555,10 @@ static void fc_exch_abts_resp(struct fc_exch *ep, struct fc_frame *fp)
         FC_EXCH_DBG(ep, "exch: BLS rctl %x - %s\n", fh->fh_r_ctl,
                     fc_exch_rctl_name(fh->fh_r_ctl));
 
-        if (cancel_delayed_work_sync(&ep->timeout_work))
+        if (cancel_delayed_work_sync(&ep->timeout_work)) {
+                FC_EXCH_DBG(ep, "Exchange timer canceled\n");
                 fc_exch_release(ep);    /* release from pending timer hold */
+        }
 
         spin_lock_bh(&ep->ex_lock);
         switch (fh->fh_r_ctl) {
@@ -1732,8 +1745,7 @@ static void fc_exch_reset(struct fc_exch *ep)
         spin_lock_bh(&ep->ex_lock);
         fc_exch_abort_locked(ep, 0);
         ep->state |= FC_EX_RST_CLEANUP;
-        if (cancel_delayed_work(&ep->timeout_work))
-                atomic_dec(&ep->ex_refcnt);     /* drop hold for timer */
+        fc_exch_timer_cancel(ep);
         resp = ep->resp;
         ep->resp = NULL;
         if (ep->esb_stat & ESB_ST_REC_QUAL)
@@ -2128,10 +2140,8 @@ static void fc_exch_els_rrq(struct fc_frame *fp)
                 ep->esb_stat &= ~ESB_ST_REC_QUAL;
                 atomic_dec(&ep->ex_refcnt);     /* drop hold for rec qual */
         }
-        if (ep->esb_stat & ESB_ST_COMPLETE) {
-                if (cancel_delayed_work(&ep->timeout_work))
-                        atomic_dec(&ep->ex_refcnt);     /* drop timer hold */
-        }
+        if (ep->esb_stat & ESB_ST_COMPLETE)
+                fc_exch_timer_cancel(ep);
 
         spin_unlock_bh(&ep->ex_lock);