mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
[SCSI] qla2xxx: Fix vport delete hang when logins are outstanding.
Timer is required to flush out entries that may be present in work queues. Cc: stable@kernel.org Signed-off-by: Arun Easi <arun.easi@qlogic.com> Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com> Signed-off-by: James Bottomley <jbottomley@parallels.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
7630abd0c6
commit
9f40682e28
1 changed files with 3 additions and 2 deletions
|
@ -1877,14 +1877,15 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
|
||||||
|
|
||||||
scsi_remove_host(vha->host);
|
scsi_remove_host(vha->host);
|
||||||
|
|
||||||
|
/* Allow timer to run to drain queued items, when removing vp */
|
||||||
|
qla24xx_deallocate_vp_id(vha);
|
||||||
|
|
||||||
if (vha->timer_active) {
|
if (vha->timer_active) {
|
||||||
qla2x00_vp_stop_timer(vha);
|
qla2x00_vp_stop_timer(vha);
|
||||||
DEBUG15(printk(KERN_INFO "scsi(%ld): timer for the vport[%d]"
|
DEBUG15(printk(KERN_INFO "scsi(%ld): timer for the vport[%d]"
|
||||||
" = %p has stopped\n", vha->host_no, vha->vp_idx, vha));
|
" = %p has stopped\n", vha->host_no, vha->vp_idx, vha));
|
||||||
}
|
}
|
||||||
|
|
||||||
qla24xx_deallocate_vp_id(vha);
|
|
||||||
|
|
||||||
/* No pending activities shall be there on the vha now */
|
/* No pending activities shall be there on the vha now */
|
||||||
DEBUG(msleep(random32()%10)); /* Just to see if something falls on
|
DEBUG(msleep(random32()%10)); /* Just to see if something falls on
|
||||||
* the net we have placed below */
|
* the net we have placed below */
|
||||||
|
|
Loading…
Reference in a new issue