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

Commit fe7cb65d authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove LUSTRE_{,SRV_}LNET_PID 



Remove LUSTRE_LNET_PID (12354) and LUSTRE_SRV_LNET_PID (12345) from
the libcfs headers and replace their uses with a new macro
LNET_PID_LUSTRE (also 12345) in lnet/types.h.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/11985


Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09f2f175

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ 
#define LERRCHKSUM(hexnum) (((hexnum) & 0xf) ^ ((hexnum) >> 4 & 0xf) ^ \

			   ((hexnum) >> 8 & 0xf))



#define LUSTRE_SRV_LNET_PID      LUSTRE_LNET_PID



#include <linux/list.h>



/* need both kernel and user-land acceptor */

drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h

+0 −3
Original line number Diff line number Diff line
@@ -118,9 +118,6 @@ do { \ 
#define CDEBUG_STACK() (0L)

#endif /* __x86_64__ */



/* initial pid  */

#define LUSTRE_LNET_PID	  12345



#define __current_nesting_level() (0)



/**

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

+5 −2
Original line number Diff line number Diff line
@@ -1842,7 +1842,10 @@ ksocknal_query(lnet_ni_t *ni, lnet_nid_t nid, unsigned long *when) 
	unsigned long now = cfs_time_current();

	ksock_peer_t *peer = NULL;

	rwlock_t *glock = &ksocknal_data.ksnd_global_lock;

	lnet_process_id_t id = {.nid = nid, .pid = LUSTRE_SRV_LNET_PID};

	lnet_process_id_t id = {

		.nid = nid,

		.pid = LNET_PID_LUSTRE,

	};



	read_lock(glock);
@@ -2187,7 +2190,7 @@ ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) 


	case IOC_LIBCFS_ADD_PEER:

		id.nid = data->ioc_nid;

		id.pid = LUSTRE_SRV_LNET_PID;

		id.pid = LNET_PID_LUSTRE;

		return ksocknal_add_peer(ni, id,

					  data->ioc_u32[0], /* IP */

					  data->ioc_u32[1]); /* port */

drivers/staging/lustre/lnet/lnet/api-ni.c

+1 −1
Original line number Diff line number Diff line
@@ -2117,7 +2117,7 @@ static int lnet_ping(lnet_process_id_t id, int timeout_ms, 
		return -EINVAL;



	if (id.pid == LNET_PID_ANY)

		id.pid = LUSTRE_SRV_LNET_PID;

		id.pid = LNET_PID_LUSTRE;



	LIBCFS_ALLOC(info, infosz);

	if (!info)

drivers/staging/lustre/lnet/lnet/lib-move.c

+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ lnet_send(lnet_nid_t src_nid, lnet_msg_t *msg, lnet_nid_t rtr_nid) 


		msg->msg_target_is_router = 1;

		msg->msg_target.nid = lp->lp_nid;

		msg->msg_target.pid = LUSTRE_SRV_LNET_PID;

		msg->msg_target.pid = LNET_PID_LUSTRE;

	}



	/* 'lp' is our best choice of peer */