[SCSI] libfc: fix: cancel rport retry timer

The timer for rport retries wasn't getting canceled, and
would occasionally go off after the module was unloaded.

Add logic to cancel the timer in fc_rport_work().

Since we cancel the timer before deleting the rdata,
it is no longer necessary to do a get_device() for the pending timer.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index a86df0b41ae363cbced7719907e5b99b5064f82d..90cc90dd3b5dc58bcb368c80b252689e1255285f 100644 (file)
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -276,6 +276,7 @@ static void fc_rport_work(struct work_struct *work)
                mutex_unlock(&rdata->rp_mutex);
                if (rport_ops->event_callback)
                        rport_ops->event_callback(lport, rport, event);
+               cancel_delayed_work_sync(&rdata->retry_work);
                if (trans_state == FC_PORTSTATE_ROGUE)
                        put_device(&rport->dev);
                else {
@@ -433,7 +434,6 @@ static void fc_rport_timeout(struct work_struct *work)
        }
 
        mutex_unlock(&rdata->rp_mutex);
-       put_device(&rport->dev);
 }
 
 /**
@@ -494,7 +494,6 @@ static void fc_rport_error_retry(struct fc_rport *rport, struct fc_frame *fp)
                /* no additional delay on exchange timeouts */
                if (PTR_ERR(fp) == -FC_EX_TIMEOUT)
                        delay = 0;
-               get_device(&rport->dev);
                schedule_delayed_work(&rdata->retry_work, delay);
                return;
        }