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: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
index 7c5e5c805fe601bf40bb18b4eb1f1b49b0c28a83..3b16fcef1daddf1f619369f0af716bc51a4edb4e 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
@@ -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)

diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 94ccef56c4bf5e9703b34cc8a3fb2eb60a966408..80b170ee5582047646d4230566bc3f0a20ee7dd7 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -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)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c
index 990156986986c4a678940f908f4936dfadec4c71..07e76a2b12910b5c6fa2cd50c8ae9f551b799238 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/events.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/events.c
@@ -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;