commit: 9f40682e2857a3c2ddb80a87b185af3c6a708346
From: Arun Easi <[email protected]>
Date: Tue, 10 May 2011 11:18:17 -0700
Subject: [PATCH] [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: [email protected]
Signed-off-by: Arun Easi <[email protected]>
Signed-off-by: Madhuranath Iyengar <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
---
 drivers/scsi/qla2xxx/qla_attr.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 75faf48..260c030 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1877,14 +1877,15 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
 
        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) {
                qla2x00_vp_stop_timer(vha);
                DEBUG15(printk(KERN_INFO "scsi(%ld): timer for the vport[%d]"
                " = %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 */
        DEBUG(msleep(random32()%10));  /* Just to see if something falls on
                                        * the net we have placed below */

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to