Re: [PATCH 10/15] drivers/scsi/csiostor/csio_lnode.c: adjust duplicate test

[Naresh Kumar Inna <naresh@chelsio.com>]

On 1/21/2013 6:32 PM, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> Delete successive tests to the same location.  The current value of ln has
> been tested already, and is clearly not NULL, given the enclosing if
> condition.  Furthermore, the result of csio_lnode_alloc is currently
> ignored.
> 
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @s exists@
> local idexpression y;
> expression x,e;
> @@
> 
> *if ( \(x = NULL\|IS_ERR(x)\|y != 0\) )
>  { ... when forall
>    return ...; }
> ... when != \(y = e\|y += e\|y -= e\|y |= e\|y &= e\|y++\|y--\|&y\)
>     when != \(XT_GETPAGE(...,y)\|WMI_CMD_BUF(...)\)
> *if ( \(x = NULL\|IS_ERR(x)\|y != 0\) )
>  { ... when forall
>    return ...; }
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> ---
> Not tested.  I don't know if this is the right fix.
> 
>  drivers/scsi/csiostor/csio_lnode.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/csiostor/csio_lnode.c b/drivers/scsi/csiostor/csio_lnode.c
> index ffe9be0..d956f97 100644
> --- a/drivers/scsi/csiostor/csio_lnode.c
> +++ b/drivers/scsi/csiostor/csio_lnode.c
> @@ -873,7 +873,7 @@ csio_handle_link_up(struct csio_hw *hw, uint8_t portid, uint32_t fcfi,
>  		if (ln->vnp_flowid != CSIO_INVALID_IDX) {
>  			/* New VN-Port */
>  			spin_unlock_irq(&hw->lock);
> -			csio_lnode_alloc(hw);
> +			ln = csio_lnode_alloc(hw);
>  			spin_lock_irq(&hw->lock);
>  			if (!ln) {
>  				csio_err(hw,
> --

Acked-by: Naresh Kumar Inna <naresh@chelsio.com>

Thanks,
Naresh.