[Devel] Re: [PATCH] Remove some unnecessary checks on socket restart

[Serge E. Hallyn]

Quoting Dan Smith (danms at us.ibm.com):
> These two checks are removed because they cannot be true because of the
> unsigned nature of the values being examined
> 
> Signed-off-by: Dan Smith <danms at us.ibm.com>
> Cc: serue at us.ibm.com
> Cc: orenl at librato.com
> ---
>  net/checkpoint.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/net/checkpoint.c b/net/checkpoint.c
> index a11ec7a..017c7f8 100644
> --- a/net/checkpoint.c
> +++ b/net/checkpoint.c
> @@ -480,12 +480,10 @@ static int sock_cptrst(struct ckpt_ctx *ctx, struct sock *sk,
>  		ckpt_debug("socket/sock in inconsistent state: %i/%i",
>  			   h->socket.state, h->sock.state);
>  		return -EINVAL;
> -	} else if ((h->sock.state < TCP_ESTABLISHED) ||
> -		   (h->sock.state >= TCP_MAX_STATES)) {
> +	} else if (h->sock.state >= TCP_MAX_STATES) {

No, TCP_ESTABLISHED is defined to 1 isn't it?

>  		ckpt_debug("sock in invalid state: %i", h->sock.state);
>  		return -EINVAL;
> -	} else if ((h->socket.state < SS_FREE) ||
> -		   (h->socket.state > SS_DISCONNECTING)) {
> +	} else if (h->socket.state > SS_DISCONNECTING) {

Yes, thanks.

>  		ckpt_debug("socket in invalid state: %i",
>  			   h->socket.state);
>  		return -EINVAL;
> -- 
> 1.6.0.4
_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers