2015-11-17 08:44:42

by SF Markus Elfring

Subject: [PATCH] SCSI-lpfc: Delete unnecessary checks before the function call "mempool_destroy"

From: Markus Elfring <[email protected]>
Date: Tue, 17 Nov 2015 09:34:27 +0100

The mempool_destroy() function tests whether its argument is NULL
and then returns immediately. Thus the test around the calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[email protected]>
---
drivers/scsi/lpfc/lpfc_mem.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index 3fa6533..4fb3581 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -231,15 +231,13 @@ lpfc_mem_free(struct lpfc_hba *phba)
if (phba->lpfc_hbq_pool)
pci_pool_destroy(phba->lpfc_hbq_pool);
phba->lpfc_hbq_pool = NULL;
-
- if (phba->rrq_pool)
- mempool_destroy(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 && phba->active_rrq_pool) {
+ if (phba->sli_rev == LPFC_SLI_REV4) {
mempool_destroy(phba->active_rrq_pool);
phba->active_rrq_pool = NULL;
}
--
2.6.2

2015-12-16 23:17:29

by James Smart

Subject: Re: [PATCH] SCSI-lpfc: Delete unnecessary checks before the function call "mempool_destroy"

fyi - this patch was just pushed in our 11.0.0.10 patch set - patch 15/17

-- james s


On 11/17/2015 12:44 AM, SF Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Tue, 17 Nov 2015 09:34:27 +0100
>
> The mempool_destroy() function tests whether its argument is NULL
> and then returns immediately. Thus the test around the calls is not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_mem.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
> index 3fa6533..4fb3581 100644
> --- a/drivers/scsi/lpfc/lpfc_mem.c
> +++ b/drivers/scsi/lpfc/lpfc_mem.c
> @@ -231,15 +231,13 @@ lpfc_mem_free(struct lpfc_hba *phba)
> if (phba->lpfc_hbq_pool)
> pci_pool_destroy(phba->lpfc_hbq_pool);
> phba->lpfc_hbq_pool = NULL;
> -
> - if (phba->rrq_pool)
> - mempool_destroy(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 && phba->active_rrq_pool) {
> + if (phba->sli_rev == LPFC_SLI_REV4) {
> mempool_destroy(phba->active_rrq_pool);
> phba->active_rrq_pool = NULL;
> }