[PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Johannes Thumshirn]

This removes a redundant code block that will either be executed if the
ENABLE_FCP_RING_POLLING flag is set in phba->cfg_poll or not. The code is just
duplicated in both cases, hence we unify it again.

This probably is a left over from some sort of refactoring.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 drivers/scsi/lpfc/lpfc_scsi.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 152b3c8..3bd0be6 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4139,23 +4139,6 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
 	/* The sdev is not guaranteed to be valid post scsi_done upcall. */
 	cmd->scsi_done(cmd);
 
-	if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {
-		spin_lock_irqsave(&phba->hbalock, flags);
-		lpfc_cmd->pCmd = NULL;
-		spin_unlock_irqrestore(&phba->hbalock, flags);
-
-		/*
-		 * If there is a thread waiting for command completion
-		 * wake up the thread.
-		 */
-		spin_lock_irqsave(shost->host_lock, flags);
-		if (lpfc_cmd->waitq)
-			wake_up(lpfc_cmd->waitq);
-		spin_unlock_irqrestore(shost->host_lock, flags);
-		lpfc_release_scsi_buf(phba, lpfc_cmd);
-		return;
-	}
-
 	spin_lock_irqsave(&phba->hbalock, flags);
 	lpfc_cmd->pCmd = NULL;
 	spin_unlock_irqrestore(&phba->hbalock, flags);
-- 
2.7.0

Re: [PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Tomas Henzl]

On 20.1.2016 16:08, Johannes Thumshirn wrote:
> This removes a redundant code block that will either be executed if the
> ENABLE_FCP_RING_POLLING flag is set in phba->cfg_poll or not. The code is just
> duplicated in both cases, hence we unify it again.
>
> This probably is a left over from some sort of refactoring.
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>

Reviewed-by: Tomas Henzl <thenzl@redhat.com>

Tomas

> ---
>  drivers/scsi/lpfc/lpfc_scsi.c | 17 -----------------
>  1 file changed, 17 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
> index 152b3c8..3bd0be6 100644
> --- a/drivers/scsi/lpfc/lpfc_scsi.c
> +++ b/drivers/scsi/lpfc/lpfc_scsi.c
> @@ -4139,23 +4139,6 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
>  	/* The sdev is not guaranteed to be valid post scsi_done upcall. */
>  	cmd->scsi_done(cmd);
>  
> -	if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {
> -		spin_lock_irqsave(&phba->hbalock, flags);
> -		lpfc_cmd->pCmd = NULL;
> -		spin_unlock_irqrestore(&phba->hbalock, flags);
> -
> -		/*
> -		 * If there is a thread waiting for command completion
> -		 * wake up the thread.
> -		 */
> -		spin_lock_irqsave(shost->host_lock, flags);
> -		if (lpfc_cmd->waitq)
> -			wake_up(lpfc_cmd->waitq);
> -		spin_unlock_irqrestore(shost->host_lock, flags);
> -		lpfc_release_scsi_buf(phba, lpfc_cmd);
> -		return;
> -	}
> -
>  	spin_lock_irqsave(&phba->hbalock, flags);
>  	lpfc_cmd->pCmd = NULL;
>  	spin_unlock_irqrestore(&phba->hbalock, flags);

Re: [PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Matthew R. Ochs]

Reviewed-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> 

Re: [PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Sebastian Herbszt]

Johannes Thumshirn wrote:
> This removes a redundant code block that will either be executed if the
> ENABLE_FCP_RING_POLLING flag is set in phba->cfg_poll or not. The code is just
> duplicated in both cases, hence we unify it again.
> 
> This probably is a left over from some sort of refactoring.
> 
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>

Reviewed-by: Sebastian Herbszt <herbszt@gmx.de>

Re: [PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Martin K. Petersen]

>>>>> "Johannes" == Johannes Thumshirn <jthumshirn@suse.de> writes:

Johannes> This removes a redundant code block that will either be
Johannes> executed if the ENABLE_FCP_RING_POLLING flag is set in
Johannes> phba->cfg_poll or not. The code is just duplicated in both
Johannes> cases, hence we unify it again.

Johannes> This probably is a left over from some sort of refactoring.

James/Dick: Please review.

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Martin K. Petersen]

>>>>> "Johannes" == Johannes Thumshirn <jthumshirn@suse.de> writes:

Johannes> This removes a redundant code block that will either be
Johannes> executed if the ENABLE_FCP_RING_POLLING flag is set in
Johannes> phba->cfg_poll or not. The code is just duplicated in both
Johannes> cases, hence we unify it again.

James and Dick: Ping!

https://patchwork.kernel.org/patch/8072451/

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Martin K. Petersen]

>>>>> "Johannes" == Johannes Thumshirn <jthumshirn@suse.de> writes:

Johannes> This removes a redundant code block that will either be
Johannes> executed if the ENABLE_FCP_RING_POLLING flag is set in
Johannes> phba->cfg_poll or not. The code is just duplicated in both
Johannes> cases, hence we unify it again.

Johannes> This probably is a left over from some sort of refactoring.

Applied to 4.6/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] lpfc: Remove redundant code block in lpfc_scsi_cmd_iocb_cmpl

[Johannes Thumshirn]

On Wed, Feb 10, 2016 at 01:32:50PM -0500, Dick Kennedy wrote:
> Martin, 
> the FCP_RING_POLLING feature is an old driver option that we would like to
> remove from the driver. It was put in in 2006 as a feature request.
> What we don't know is if any customers still use it? or ever used it. 
> 
> The patch looks fine. 
> ACK

Dick, is there any chance you could Ack my lockdep assertion patch as well?
Bart seemed to like it and I think our support people will do as well as it
screams pretty loud when something isn't golden there.

TIA,
	Johannes

> 
> On Wed, Feb 10, 2016 at 12:37 PM, Martin K. Petersen <
> martin.petersen@oracle.com> wrote:
> 
>     >>>>> "Johannes" == Johannes Thumshirn <jthumshirn@suse.de> writes:
> 
>     Johannes> This removes a redundant code block that will either be
>     Johannes> executed if the ENABLE_FCP_RING_POLLING flag is set in
>     Johannes> phba->cfg_poll or not. The code is just duplicated in both
>     Johannes> cases, hence we unify it again.
> 
>     James and Dick: Ping!
> 
>     https://patchwork.kernel.org/patch/8072451/
>    
>     --
>     Martin K. Petersen      Oracle Linux Engineering
> 
> 

-- 
Johannes Thumshirn                                          Storage
jthumshirn@suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850