[patch] iscsi: change & to &&

[patch] iscsi: change & to &&

[Dan Carpenter]

This change is basically a clean up.

datadgst_en is an int which comes from the user.  I didn't see anything
limiting it to 1 and 0 although obviously that's what it's supposed to 
be.  If the user passed in 2 this test would fail.

This same if condition is repeated in another function and it uses && 
there.

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 4ad87fd..3794d29 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -420,7 +420,7 @@ iscsi_tcp_data_recv_prep(struct iscsi_tcp_conn *tcp_conn)
 	struct iscsi_conn *conn = tcp_conn->iscsi_conn;
 	struct hash_desc *rx_hash = NULL;
 
-	if (conn->datadgst_en &
+	if (conn->datadgst_en &&
 	    !(conn->session->tt->caps & CAP_DIGEST_OFFLOAD))
 		rx_hash = tcp_conn->rx_hash;
 

[patch] iscsi: change & to &&

[Dan Carpenter]

This change is basically a clean up.

datadgst_en is an int which comes from the user.  I didn't see anything
limiting it to 1 and 0 although obviously that's what it's supposed to 
be.  If the user passed in 2 this test would fail.

This same if condition is repeated in another function and it uses && 
there.

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 4ad87fd..3794d29 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -420,7 +420,7 @@ iscsi_tcp_data_recv_prep(struct iscsi_tcp_conn *tcp_conn)
 	struct iscsi_conn *conn = tcp_conn->iscsi_conn;
 	struct hash_desc *rx_hash = NULL;
 
-	if (conn->datadgst_en &
+	if (conn->datadgst_en &&
 	    !(conn->session->tt->caps & CAP_DIGEST_OFFLOAD))
 		rx_hash = tcp_conn->rx_hash;
 

Re: [patch] iscsi: change & to &&

[Mike Christie]

On 03/08/2010 06:21 AM, Dan Carpenter wrote:
> This change is basically a clean up.
>
> datadgst_en is an int which comes from the user.  I didn't see anything
> limiting it to 1 and 0 although obviously that's what it's supposed to
> be.  If the user passed in 2 this test would fail.
>
> This same if condition is repeated in another function and it uses&&
> there.
>
> Signed-off-by: Dan Carpenter<error27@gmail.com>
>
> diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
> index 4ad87fd..3794d29 100644
> --- a/drivers/scsi/libiscsi_tcp.c
> +++ b/drivers/scsi/libiscsi_tcp.c
> @@ -420,7 +420,7 @@ iscsi_tcp_data_recv_prep(struct iscsi_tcp_conn *tcp_conn)
>   	struct iscsi_conn *conn = tcp_conn->iscsi_conn;
>   	struct hash_desc *rx_hash = NULL;
>
> -	if (conn->datadgst_en&
> +	if (conn->datadgst_en&&
>   	!(conn->session->tt->caps&  CAP_DIGEST_OFFLOAD))
>   		rx_hash = tcp_conn->rx_hash;
>

Doh. Thanks!

Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>

Re: [patch] iscsi: change & to &&

[Mike Christie]

On 03/08/2010 06:21 AM, Dan Carpenter wrote:
> This change is basically a clean up.
>
> datadgst_en is an int which comes from the user.  I didn't see anything
> limiting it to 1 and 0 although obviously that's what it's supposed to
> be.  If the user passed in 2 this test would fail.
>
> This same if condition is repeated in another function and it uses&&
> there.
>
> Signed-off-by: Dan Carpenter<error27-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
> diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
> index 4ad87fd..3794d29 100644
> --- a/drivers/scsi/libiscsi_tcp.c
> +++ b/drivers/scsi/libiscsi_tcp.c
> @@ -420,7 +420,7 @@ iscsi_tcp_data_recv_prep(struct iscsi_tcp_conn *tcp_conn)
>   	struct iscsi_conn *conn = tcp_conn->iscsi_conn;
>   	struct hash_desc *rx_hash = NULL;
>
> -	if (conn->datadgst_en&
> +	if (conn->datadgst_en&&
>   	!(conn->session->tt->caps&  CAP_DIGEST_OFFLOAD))
>   		rx_hash = tcp_conn->rx_hash;
>

Doh. Thanks!

Reviewed-by: Mike Christie <michaelc-hcNo3dDEHLuVc3sceRu5cw@public.gmane.org>

-- 
You received this message because you are subscribed to the Google Groups "open-iscsi" group.
To post to this group, send email to open-iscsi-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to open-iscsi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/open-iscsi?hl=en.