From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33598 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbcFDTbF (ORCPT ); Sat, 4 Jun 2016 15:31:05 -0400 Subject: Patch "Revert "lpfc: Delete unnecessary checks before the function call mempool_destroy"" has been added to the 4.6-stable tree To: martin.petersen@oracle.com, dick.kennedy@broadcom.com, gregkh@linuxfoundation.org, jejb@linux.vnet.ibm.com Cc: , From: Date: Sat, 04 Jun 2016 12:31:03 -0700 Message-ID: <14650686639778@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Revert "lpfc: Delete unnecessary checks before the function call mempool_destroy" to the 4.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-lpfc-delete-unnecessary-checks-before-the-function-call-mempool_destroy.patch and it can be found in the queue-4.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d65c8fff867a6450c58ce31572e883148a445ddf Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Mon, 9 May 2016 21:39:43 -0400 Subject: Revert "lpfc: Delete unnecessary checks before the function call mempool_destroy" From: Martin K. Petersen commit d65c8fff867a6450c58ce31572e883148a445ddf upstream. This reverts commit 9be321819c43417432a8376428b90fe3fe3a3510 which caused a regression on hardware using the SLI3 interface. Reported-by: Dick Kennedy Signed-off-by: Martin K. Petersen Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/lpfc/lpfc_mem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c @@ -231,13 +231,15 @@ lpfc_mem_free(struct lpfc_hba *phba) if (phba->lpfc_hbq_pool) pci_pool_destroy(phba->lpfc_hbq_pool); phba->lpfc_hbq_pool = NULL; - mempool_destroy(phba->rrq_pool); + + if (phba->rrq_pool) + mempool_destroy(phba->rrq_pool); phba->rrq_pool = NULL; /* Free NLP memory pool */ mempool_destroy(phba->nlp_mem_pool); phba->nlp_mem_pool = NULL; - if (phba->sli_rev == LPFC_SLI_REV4) { + if (phba->sli_rev == LPFC_SLI_REV4 && phba->active_rrq_pool) { mempool_destroy(phba->active_rrq_pool); phba->active_rrq_pool = NULL; } Patches currently in stable-queue which might be from martin.petersen@oracle.com are queue-4.6/aacraid-fix-for-kdump-driver-hang.patch queue-4.6/aacraid-start-adapter-after-updating-number-of-msix-vectors.patch queue-4.6/revert-lpfc-delete-unnecessary-checks-before-the-function-call-mempool_destroy.patch queue-4.6/aacraid-fix-for-aac_command_thread-hang.patch queue-4.6/aacraid-relinquish-cpu-during-timeout-wait.patch