Commit 127aaef4 authored Mar 21, 2018 by Justin Skists Committed by Greg Kroah-Hartman Mar 22, 2018

staging: lustre: lnet: use correct 'magic' test



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: 80782927 ("staging: lustre: Fix unneeded byte-ordering cast")
Signed-off-by: Justin Skists <j.skists@gmail.com>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f65d6eb4

drivers/staging/lustre/lnet/lnet/acceptor.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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";

Admin message