Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751139AbWINVNF (ORCPT ); Thu, 14 Sep 2006 17:13:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751138AbWINVNF (ORCPT ); Thu, 14 Sep 2006 17:13:05 -0400 Received: from stat9.steeleye.com ([209.192.50.41]:33256 "EHLO hancock.sc.steeleye.com") by vger.kernel.org with ESMTP id S1751137AbWINVNE (ORCPT ); Thu, 14 Sep 2006 17:13:04 -0400 Subject: [GIT PATCH] (hopefully) final SCSI fixes for 2.6.19 From: James Bottomley To: Linus Torvalds , Andrew Morton Cc: linux-kernel , linux-scsi Content-Type: text/plain Date: Thu, 14 Sep 2006 16:12:58 -0500 Message-Id: <1158268378.3514.61.camel@mulgrave.il.steeleye.com> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 (2.2.3-4.fc4) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1633 Lines: 51 The patch is here master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git However, as there's only a single patch in there, I attach it in case you'd prefer simply to apply it as a patch rather than merge a single patch tree. James --- commit 15d100224c123f0f993ef88e95fd5d46bb0bd085 Author: James Smart Date: Thu Aug 31 12:27:57 2006 -0400 [SCSI] lpfc: don't free mempool if mailbox is busy Signed-off-by: James Bottomley diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index f6948ff..c31fe41 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -387,7 +387,8 @@ lpfc_config_port_post(struct lpfc_hba * lpfc_init_link(phba, pmb, phba->cfg_topology, phba->cfg_link_speed); pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl; - if (lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT) != MBX_SUCCESS) { + rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT); + if (rc != MBX_SUCCESS) { lpfc_printf_log(phba, KERN_ERR, LOG_INIT, @@ -404,7 +405,8 @@ lpfc_config_port_post(struct lpfc_hba * readl(phba->HAregaddr); /* flush */ phba->hba_state = LPFC_HBA_ERROR; - mempool_free(pmb, phba->mbox_mem_pool); + if (rc != MBX_BUSY) + mempool_free(pmb, phba->mbox_mem_pool); return -EIO; } /* MBOX buffer will be freed in mbox compl */ - 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/