X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-socket.c;h=4a8bf1a2226908e5ec8b7abc161379cf0038384b;hp=8afc4b50fa1be4dbff03183bf0ec9e76287784b3;hb=a9be63cbb4764b0ad55a749ecb0222318778b233;hpb=dbb81e826290b2db27e24a85869c9d0736726caa

diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c
index 8afc4b5..4a8bf1a 100644
--- a/lnet/lnet/lib-socket.c
+++ b/lnet/lnet/lib-socket.c
@@ -43,197 +43,26 @@
 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 
-static int
-lnet_sock_ioctl(int cmd, unsigned long arg)
-{
-	struct socket *sock;
-	int rc;
-
-#ifdef HAVE_SOCK_CREATE_KERN_USE_NET
-	rc = sock_create_kern(&init_net, PF_INET, SOCK_STREAM, 0, &sock);
-#else
-	rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock);
+/*
+ * kernel 5.1: commit 7f1bc6e95d7840d4305595b3e4025cddda88cee5
+ * Y2038 64-bit time.
+ *  SO_TIMESTAMP, SO_TIMESTAMPNS and SO_TIMESTAMPING options, the
+ *  way they are currently defined, are not y2038 safe.
+ *  Subsequent patches in the series add new y2038 safe versions
+ *  of these options which provide 64 bit timestamps on all
+ *  architectures uniformly.
+ *  Hence, rename existing options with OLD tag suffixes.
+ *
+ * NOTE: When updating to timespec64 change change these to '_NEW'.
+ *
+ */
+#ifndef SO_SNDTIMEO
+#define SO_SNDTIMEO SO_SNDTIMEO_OLD
 #endif
-	if (rc != 0) {
-		CERROR("Can't create socket: %d\n", rc);
-		return rc;
-	}
-
-	if (cmd == SIOCGIFFLAGS) {
-		/* This cmd is used only to get IFF_UP flag */
-		struct ifreq *ifr = (struct ifreq *) arg;
-		struct net_device *dev;
-
-		dev = dev_get_by_name(sock_net(sock->sk), ifr->ifr_name);
-		if (dev) {
-			ifr->ifr_flags = dev->flags;
-			dev_put(dev);
-			rc = 0;
-		} else {
-			rc = -ENODEV;
-		}
-	} else {
-		rc = kernel_sock_ioctl(sock, cmd, arg);
-	}
-	sock_release(sock);
-
-	return rc;
-}
-
-int
-lnet_ipif_query(char *name, int *up, __u32 *ip, __u32 *mask)
-{
-	struct ifreq	ifr;
-	int		nob;
-	int		rc;
-	__u32		val;
-
-	nob = strnlen(name, IFNAMSIZ);
-	if (nob == IFNAMSIZ) {
-		CERROR("Interface name %s too long\n", name);
-		return -EINVAL;
-	}
-
-	CLASSERT(sizeof(ifr.ifr_name) >= IFNAMSIZ);
-
-	if (strlen(name) > sizeof(ifr.ifr_name)-1)
-		return -E2BIG;
-	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
-
-	rc = lnet_sock_ioctl(SIOCGIFFLAGS, (unsigned long)&ifr);
-	if (rc != 0) {
-		CERROR("Can't get flags for interface %s\n", name);
-		return rc;
-	}
-
-	if ((ifr.ifr_flags & IFF_UP) == 0) {
-		CDEBUG(D_NET, "Interface %s down\n", name);
-		*up = 0;
-		*ip = *mask = 0;
-		return 0;
-	}
-	*up = 1;
-
-	if (strlen(name) > sizeof(ifr.ifr_name)-1)
-		return -E2BIG;
-	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
-
-	ifr.ifr_addr.sa_family = AF_INET;
-	rc = lnet_sock_ioctl(SIOCGIFADDR, (unsigned long)&ifr);
-
-	if (rc != 0) {
-		CERROR("Can't get IP address for interface %s\n", name);
-		return rc;
-	}
 
-	val = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
-	*ip = ntohl(val);
-
-	if (strlen(name) > sizeof(ifr.ifr_name)-1)
-		return -E2BIG;
-	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
-
-	ifr.ifr_addr.sa_family = AF_INET;
-	rc = lnet_sock_ioctl(SIOCGIFNETMASK, (unsigned long)&ifr);
-	if (rc != 0) {
-		CERROR("Can't get netmask for interface %s\n", name);
-		return rc;
-	}
-
-	val = ((struct sockaddr_in *)&ifr.ifr_netmask)->sin_addr.s_addr;
-	*mask = ntohl(val);
-
-	return 0;
-}
-EXPORT_SYMBOL(lnet_ipif_query);
-
-void
-lnet_ipif_free_enumeration(char **names, int n)
-{
-	int	i;
-
-	LASSERT(n > 0);
-
-	for (i = 0; i < n && names[i] != NULL; i++)
-		LIBCFS_FREE(names[i], IFNAMSIZ);
-
-	LIBCFS_FREE(names, n * sizeof(*names));
-}
-EXPORT_SYMBOL(lnet_ipif_free_enumeration);
-
-int
-lnet_ipif_enumerate(char ***namesp)
-{
-	/* Allocate and fill in 'names', returning # interfaces/error */
-	struct net_device *dev;
-	struct socket *sock;
-	char **names;
-	int toobig;
-	int nalloc;
-	int nfound;
-	int rc;
-	int nob;
-	int i;
-
-	nalloc = 16;	/* first guess at max interfaces */
-	toobig = 0;
-	nfound = 0;
-
-#ifdef HAVE_SOCK_CREATE_KERN_USE_NET
-	rc = sock_create_kern(&init_net, PF_INET, SOCK_STREAM, 0, &sock);
-#else
-	rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock);
+#ifndef SO_RCVTIMEO
+#define SO_RCVTIMEO SO_RCVTIMEO_OLD
 #endif
-	if (rc) {
-		CERROR("Can't create socket: %d\n", rc);
-		return rc;
-	}
-
-	for_each_netdev(sock_net(sock->sk), dev)
-		nfound++;
-
-	if (nfound == 0)
-		goto out_release_sock;
-
-	LIBCFS_ALLOC(names, nfound * sizeof(*names));
-	if (names == NULL) {
-		rc = -ENOMEM;
-		goto out_release_sock;
-	}
-
-	i = 0;
-	for_each_netdev(sock_net(sock->sk), dev) {
-		nob = strnlen(dev->name, IFNAMSIZ);
-		if (nob == IFNAMSIZ) {
-			/* no space for terminating NULL */
-			CERROR("interface name %.*s too long (%d max)\n",
-			       nob, dev->name, IFNAMSIZ);
-			rc = -ENAMETOOLONG;
-			goto out_free_names;
-		}
-
-		LIBCFS_ALLOC(names[i], IFNAMSIZ);
-		if (!names[i]) {
-			rc = -ENOMEM;
-			goto out_free_names;
-		}
-
-		memcpy(names[i], dev->name, nob);
-		names[i][nob] = 0;
-		i++;
-	}
-
-	*namesp = names;
-	rc = i;
-
-out_free_names:
-	if (rc < 0)
-		lnet_ipif_free_enumeration(names, nfound);
-out_release_sock:
-	sock_release(sock);
-	return rc;
-}
-EXPORT_SYMBOL(lnet_ipif_enumerate);
 
 int
 lnet_sock_write(struct socket *sock, void *buffer, int nob, int timeout)