Commit ee11f922 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/lnet: Get rid of IOC_LIBCFS_PORTALS_COMPATIBILITY ioctl 



This has been unused for ages and could be safely removed now.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 71c36dd7

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct libcfs_ioctl_handler { 
#define IOC_LIBCFS_GET_ROUTE	       _IOWR('e', 54, long)

#define IOC_LIBCFS_NOTIFY_ROUTER	   _IOWR('e', 55, long)

#define IOC_LIBCFS_UNCONFIGURE	     _IOWR('e', 56, long)

#define IOC_LIBCFS_PORTALS_COMPATIBILITY   _IOWR('e', 57, long)

/*	#define IOC_LIBCFS_PORTALS_COMPATIBILITY   _IOWR('e', 57, long) */

#define IOC_LIBCFS_LNET_DIST	       _IOWR('e', 58, long)

#define IOC_LIBCFS_CONFIGURE	       _IOWR('e', 59, long)

#define IOC_LIBCFS_TESTPROTOCOMPAT	 _IOWR('e', 60, long)

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

+0 −6
Original line number Diff line number Diff line
@@ -1318,8 +1318,6 @@ EXPORT_SYMBOL(LNetNIFini); 
/**

 * LNet ioctl handler.

 *

 * IOC_LIBCFS_PORTALS_COMPATIBILITY is now deprecated, don't use it.

 *

 */

int

LNetCtl(unsigned int cmd, void *arg)
@@ -1360,10 +1358,6 @@ LNetCtl(unsigned int cmd, void *arg) 
		return lnet_notify(NULL, data->ioc_nid, data->ioc_flags,

				   jiffies - secs_passed * HZ);



	case IOC_LIBCFS_PORTALS_COMPATIBILITY:

		/* This can be removed once lustre stops calling it */

		return 0;



	case IOC_LIBCFS_LNET_DIST:

		rc = LNetDist(data->ioc_nid, &data->ioc_nid, &data->ioc_u32[1]);

		if (rc < 0 && rc != -EHOSTUNREACH)

drivers/staging/lustre/lustre/ptlrpc/events.c

+0 −11
Original line number Diff line number Diff line
@@ -438,14 +438,11 @@ int ptlrpc_uuid_to_peer(struct obd_uuid *uuid, 
	__u32 best_order = 0;

	int count = 0;

	int rc = -ENOENT;

	int portals_compatibility;

	int dist;

	__u32 order;

	lnet_nid_t dst_nid;

	lnet_nid_t src_nid;



	portals_compatibility = LNetCtl(IOC_LIBCFS_PORTALS_COMPATIBILITY, NULL);



	peer->pid = LUSTRE_SRV_LNET_PID;



	/* Choose the matching UUID that's closest */
@@ -466,14 +463,6 @@ int ptlrpc_uuid_to_peer(struct obd_uuid *uuid, 
			best_dist = dist;

			best_order = order;



			if (portals_compatibility > 1) {

				/* Strong portals compatibility: Zero the nid's

				 * NET, so if I'm reading new config logs, or

				 * getting configured by (new) lconf I can

				 * still talk to old servers. */

				dst_nid = LNET_MKNID(0, LNET_NIDADDR(dst_nid));

				src_nid = LNET_MKNID(0, LNET_NIDADDR(src_nid));

			}

			peer->nid = dst_nid;

			*self = src_nid;

			rc = 0;