Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04d86158 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: socklnd: remove socklnd_init_msg 



Remove the inline function socklnd_init_msg.
Its only used by the kernel code so no point
keeping it in an UAPI header.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: https://review.whamcloud.com/18506


Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6cd67869

drivers/staging/lustre/include/linux/lnet/socklnd.h

+0 −9
Original line number Diff line number Diff line
@@ -80,15 +80,6 @@ typedef struct { 
	} WIRE_ATTR ksm_u;

} WIRE_ATTR ksock_msg_t;



static inline void

socklnd_init_msg(ksock_msg_t *msg, int type)

{

	msg->ksm_csum = 0;

	msg->ksm_type = type;

	msg->ksm_zc_cookies[0] = 0;

	msg->ksm_zc_cookies[1] = 0;

}



#define KSOCK_MSG_NOOP	0xC0	/* ksm_u empty */

#define KSOCK_MSG_LNET	0xC1	/* lnet msg */

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+7 −2
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ ksocknal_alloc_tx_noop(__u64 cookie, int nonblk) 
	tx->tx_niov    = 1;

	tx->tx_nonblk  = nonblk;



	socklnd_init_msg(&tx->tx_msg, KSOCK_MSG_NOOP);

	tx->tx_msg.ksm_csum = 0;

	tx->tx_msg.ksm_type = KSOCK_MSG_NOOP;

	tx->tx_msg.ksm_zc_cookies[0] = 0;

	tx->tx_msg.ksm_zc_cookies[1] = cookie;



	return tx;
@@ -1004,7 +1006,10 @@ ksocknal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) 
			tx->tx_zc_capable = 1;

	}



	socklnd_init_msg(&tx->tx_msg, KSOCK_MSG_LNET);

	tx->tx_msg.ksm_csum = 0;

	tx->tx_msg.ksm_type = KSOCK_MSG_LNET;

	tx->tx_msg.ksm_zc_cookies[0] = 0;

	tx->tx_msg.ksm_zc_cookies[1] = 0;



	/* The first fragment will be set later in pro_pack */

	rc = ksocknal_launch_packet(ni, tx, target);