New tag 2.15.63

[fs/lustre-release.git] / libcfs / include / libcfs / util / ioctl.h

diff --git a/libcfs/include/libcfs/util/ioctl.h b/libcfs/include/libcfs/util/ioctl.h
index eddd4f1..c99fda6 100644 (file)
--- a/libcfs/include/libcfs/util/ioctl.h
+++ b/libcfs/include/libcfs/util/ioctl.h
@@ -23,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
  *
@@ -43,26 +42,26 @@
 /* Sparse annotation. */
 #define __user
 
-#include <uapi/linux/lnet/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