Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 201e5795 authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley
Browse files

[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: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 5f7ea3b7

drivers/scsi/libfc/fc_rport.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

	}