X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Futil%2Fioctl.h;h=a59e2c97ba2ff2ea72ed045e63ff54ec47abdc32;hb=HEAD;hp=c8a1242d82274a91e969ac819dc822c5e4076f87;hpb=cf7df5976769bbaa8cab1fc7b8fb80296bfef833;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/util/ioctl.h b/libcfs/include/libcfs/util/ioctl.h
index c8a1242..c99fda6 100644
--- a/libcfs/include/libcfs/util/ioctl.h
+++ b/libcfs/include/libcfs/util/ioctl.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,11 +23,10 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * libcfs/include/libcfs/util/ioctl.h
  *
@@ -47,26 +42,26 @@
 /* Sparse annotation. */
 #define __user
 
-#include <libcfs/libcfs_ioctl.h>
+#include <linux/lnet/libcfs_ioctl.h>
 
 #define LIBCFS_IOC_INIT(data)					\
 do {								\
 	memset(&(data), 0, sizeof(data));			\
-	(data).ioc_hdr.ioc_version = LIBCFS_IOCTL_VERSION;	\
+	(data).ioc_hdr.ioc_version = LNET_IOCTL_VERSION;	\
 	(data).ioc_hdr.ioc_len = sizeof(data);			\
 } while (0)
 
 #define LIBCFS_IOC_INIT_V2(data, hdr)			\
 do {							\
 	memset(&(data), 0, sizeof(data));		\
-	(data).hdr.ioc_version = LIBCFS_IOCTL_VERSION2;	\
+	(data).hdr.ioc_version = LNET_IOCTL_VERSION2;	\
 	(data).hdr.ioc_len = sizeof(data);		\
 } while (0)
 
 /* FIXME - rename these to libcfs_ */
 int libcfs_ioctl_pack(struct libcfs_ioctl_data *data, char **pbuf, int max);
 void libcfs_ioctl_unpack(struct libcfs_ioctl_data *data, char *pbuf);
-int register_ioc_dev(int dev_id, const char *dev_name, int major, int minor);
+int register_ioc_dev(int dev_id, const char *dev_name);
 void unregister_ioc_dev(int dev_id);
 int l_ioctl(int dev_id, unsigned int opc, void *buf);
 #endif