Re: [PATCH] staging: lustre: lnet: use correct 'magic' test

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Mar 21 2018, Justin Skists wrote:

> Use the lnet_magic_accept() function to compare 'magic' against
> LNET_PROTO_TCP_MAGIC for the appropriate string for an error message.
>
> The original fix removed an unneeded byte-ordering cast because the define
> was already CPU byte-ordered and it was assumed that 'magic' was CPU
> byte-ordered, too.
>
> Now modify the if-statement to use the appropriate lnet_accept_magic()
> function in order to be consistent with similar tests. This will allow
> the code to be consistent with the general understanding that 'magic'
> should be in host-byte-order for the peer that sent the message.
>
> Fixes: 80782927e3aa ("staging: lustre: Fix unneeded byte-ordering cast")
> Cc: NeilBrown <neilb@xxxxxxxx>

Reviewed-by: NeilBrown <neilb@xxxxxxxx>

thanks,
NeilBrown

> Signed-off-by: Justin Skists <j.skists@xxxxxxxxx>
> ---
>  drivers/staging/lustre/lnet/lnet/acceptor.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c
> index 13e981781b9a..5648f17eddc0 100644
> --- a/drivers/staging/lustre/lnet/lnet/acceptor.c
> +++ b/drivers/staging/lustre/lnet/lnet/acceptor.c
> @@ -240,7 +240,7 @@ lnet_accept(struct socket *sock, __u32 magic)
>  			return -EPROTO;
>  		}
>  
> -		if (magic == LNET_PROTO_TCP_MAGIC)
> +		if (lnet_accept_magic(magic, LNET_PROTO_TCP_MAGIC))
>  			str = "'old' socknal/tcpnal";
>  		else
>  			str = "unrecognised";
> -- 
> 2.16.2

Attachment: signature.asc
Description: PGP signature

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux