Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161168Ab1FAIHN (ORCPT ); Wed, 1 Jun 2011 04:07:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42401 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161146Ab1FAIHI (ORCPT ); Wed, 1 Jun 2011 04:07:08 -0400 X-Mailbox-Line: From linux@blue.kroah.org Wed Jun 1 17:02:36 2011 Message-Id: <20110601080235.610959782@blue.kroah.org> User-Agent: quilt/0.48-16.4 Date: Wed, 01 Jun 2011 16:59:06 +0900 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Arun Easi , Madhuranath Iyengar , James Bottomley , James Bottomley , Greg Kroah-Hartman Subject: [010/146] [SCSI] qla2xxx: Fix vport delete hang when logins are outstanding. In-Reply-To: <20110601080606.GA522@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1571 Lines: 47 2.6.38-stable review patch. If anyone has any objections, please let us know. ------------------ From: Arun Easi commit 9f40682e2857a3c2ddb80a87b185af3c6a708346 upstream. Timer is required to flush out entries that may be present in work queues. Signed-off-by: Arun Easi Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/qla2xxx/qla_attr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- 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 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/