staging: lustre: lnet: migrate headers to lnet uapi directory

Migrate the headers used by user land and kernel space to the
libcfs/lnet uapi directory.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-on: https://review.whamcloud.com/28089Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Olaf Weber <olaf.weber@hpe.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

@@ -77,7 +77,7 @@ void cfs_get_random_bytes(void *buf, int size);
 #include "libcfs_debug.h"
 #include "libcfs_cpu.h"
 #include "libcfs_private.h"
-#include "libcfs_ioctl.h"
+#include "../../uapi/linux/lnet/libcfs_ioctl.h"
 #include "libcfs_prim.h"
 #include "libcfs_time.h"
 #include "libcfs_string.h"

drivers/staging/lustre/include/linux/lnet/api.h

@@ -44,7 +44,7 @@
  * @{
  */
 
-#include "../lnet/types.h"
+#include "../../uapi/linux/lnet/lnet-types.h"
 
 /** \defgroup lnet_init_fini Initialization and cleanup
  * The LNet must be properly initialized before any LNet calls can be made.

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

@@ -38,10 +38,10 @@
 #include "../libcfs/libcfs.h"
 #include "api.h"
 #include "lib-types.h"
-#include "lib-dlc.h"
-#include "types.h"
-#include "lnetctl.h"
-#include "nidstr.h"
+#include "../../uapi/linux/lnet/lnet-dlc.h"
+#include "../../uapi/linux/lnet/lnet-types.h"
+#include "../../uapi/linux/lnet/lnetctl.h"
+#include "../../uapi/linux/lnet/nidstr.h"
 
 extern struct lnet the_lnet;	/* THE network */
 

drivers/staging/lustre/include/linux/lnet/lib-types.h

@@ -40,8 +40,8 @@
 #include <linux/types.h>
 #include <linux/completion.h>
 
-#include "types.h"
-#include "lnetctl.h"
+#include "../../uapi/linux/lnet/lnet-types.h"
+#include "../../uapi/linux/lnet/lnetctl.h"
 
 /* Max payload size */
 #define LNET_MAX_PAYLOAD      CONFIG_LNET_MAX_PAYLOAD

drivers/staging/lustre/include/linux/lnet/socklnd.h

@@ -34,7 +34,7 @@
 #ifndef __LNET_LNET_SOCKLND_H__
 #define __LNET_LNET_SOCKLND_H__
 
-#include "types.h"
+#include "../../uapi/linux/lnet/lnet-types.h"
 #include "../../uapi/linux/lnet/socklnd.h"
 
 struct ksock_hello_msg {

drivers/staging/lustre/include/linux/lnet/lib-dlc.h → drivers/staging/lustre/include/uapi/linux/lnet/lnet-dlc.h

@@ -29,8 +29,8 @@
 #ifndef LNET_DLC_H
 #define LNET_DLC_H
 
-#include "../libcfs/libcfs_ioctl.h"
-#include "types.h"
+#include "libcfs_ioctl.h"
+#include "lnet-types.h"
 
 #define MAX_NUM_SHOW_ENTRIES	32
 #define LNET_MAX_STR_LEN	128

drivers/staging/lustre/include/linux/lnet/lnetctl.h → drivers/staging/lustre/include/uapi/linux/lnet/lnetctl.h

@@ -15,7 +15,7 @@
 #ifndef _LNETCTL_H_
 #define _LNETCTL_H_
 
-#include "types.h"
+#include "lnet-types.h"
 
 /** \addtogroup lnet_fault_simulation
  * @{

drivers/staging/lustre/include/linux/lnet/nidstr.h → drivers/staging/lustre/include/uapi/linux/lnet/nidstr.h

@@ -28,7 +28,7 @@
 #ifndef _LNET_NIDSTRINGS_H
 #define _LNET_NIDSTRINGS_H
 
-#include "types.h"
+#include "lnet-types.h"
 
 /**
  *  Lustre Network Driver types.

drivers/staging/lustre/lnet/libcfs/module.c

@@ -55,7 +55,7 @@
 
 #include "../../include/linux/libcfs/libcfs_crypto.h"
 #include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
+#include "../../include/uapi/linux/lnet/lnet-dlc.h"
 #include "tracefile.h"
 
 static struct dentry *lnet_debugfs_root;

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

@@ -35,7 +35,7 @@
 #include <linux/ktime.h>
 
 #include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
+#include "../../include/uapi/linux/lnet/lnet-dlc.h"
 
 #define D_LNI D_CONSOLE
 

drivers/staging/lustre/lnet/lnet/module.c

@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 #include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
+#include "../../include/uapi/linux/lnet/lnet-dlc.h"
 
 static int config_on_load;
 module_param(config_on_load, int, 0444);

drivers/staging/lustre/lnet/lnet/net_fault.c

@@ -36,7 +36,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lnetctl.h"
+#include "../../include/uapi/linux/lnet/lnetctl.h"
 
 #define LNET_MSG_MASK		(LNET_PUT_BIT | LNET_ACK_BIT | \
 				 LNET_GET_BIT | LNET_REPLY_BIT)

drivers/staging/lustre/lnet/lnet/nidstrings.c

@@ -37,7 +37,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/nidstr.h"
+#include "../../include/uapi/linux/lnet/nidstr.h"
 
 /* max value for numeric network address */
 #define MAX_NUMERIC_VALUE 0xffffffff

drivers/staging/lustre/lnet/lnet/peer.c

@@ -35,7 +35,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
+#include "../../include/uapi/linux/lnet/lnet-dlc.h"
 
 int
 lnet_peer_tables_create(void)

drivers/staging/lustre/lnet/selftest/conctl.c

@@ -38,7 +38,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "../../include/uapi/linux/lnet/lnetst.h"
 #include "console.h"
 
 static int

drivers/staging/lustre/lnet/selftest/conrpc.h

@@ -41,7 +41,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/linux/lnet/lib-types.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "../../include/uapi/linux/lnet/lnetst.h"
 #include "rpc.h"
 #include "selftest.h"
 

drivers/staging/lustre/lnet/selftest/console.h

@@ -41,7 +41,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/linux/lnet/lib-types.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "../../include/uapi/linux/lnet/lnetst.h"
 #include "selftest.h"
 #include "conrpc.h"
 

drivers/staging/lustre/lnet/selftest/rpc.h

@@ -33,7 +33,7 @@
 #ifndef __SELFTEST_RPC_H__
 #define __SELFTEST_RPC_H__
 
-#include "../../include/linux/lnet/lnetst.h"
+#include "../../include/uapi/linux/lnet/lnetst.h"
 
 /*
  * LST wired structures

drivers/staging/lustre/lnet/selftest/selftest.h

@@ -41,7 +41,7 @@
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/linux/lnet/lib-lnet.h"
 #include "../../include/linux/lnet/lib-types.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "../../include/uapi/linux/lnet/lnetst.h"
 
 #include "rpc.h"
 #include "timer.h"

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

@@ -70,8 +70,7 @@
 #define _LUSTRE_IDL_H_
 
 #include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/lnet/types.h"
-
+#include "../../../include/uapi/linux/lnet/lnet-types.h"
 /* Defn's shared with user-space. */
 #include "lustre_user.h"
 #include "../lustre_ver.h"

drivers/staging/lustre/lustre/include/lustre_disk.h

@@ -45,7 +45,6 @@
  */
 
 #include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/types.h"
 #include <linux/backing-dev.h>
 
 /****************** persistent mount data *********************/

drivers/staging/lustre/lustre/include/lustre_net.h

@@ -52,7 +52,7 @@
 
 #include <linux/uio.h>
 #include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/nidstr.h"
+#include "../../include/uapi/linux/lnet/nidstr.h"
 #include "../../include/linux/lnet/api.h"
 #include "lustre/lustre_idl.h"
 #include "lustre_ha.h"

drivers/staging/lustre/lustre/obdclass/class_obd.c

@@ -35,7 +35,7 @@
 
 #include "../include/obd_support.h"
 #include "../include/obd_class.h"
-#include "../../include/linux/lnet/lnetctl.h"
+#include "../../include/uapi/linux/lnet/lnetctl.h"
 #include "../include/lustre_debug.h"
 #include "../include/lprocfs_status.h"
 #include <linux/list.h>

drivers/staging/lustre/lustre/obdclass/linux/linux-module.c

@@ -61,7 +61,7 @@
 #include <linux/kobject.h>
 
 #include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/lnet/lnetctl.h"
+#include "../../../include/uapi/linux/lnet/lnetctl.h"
 #include "../../include/obd_support.h"
 #include "../../include/obd_class.h"
 #include "../../include/lprocfs_status.h"

drivers/staging/lustre/lustre/ptlrpc/service.c

@@ -35,7 +35,7 @@
 #include "../include/obd_class.h"
 #include "../include/lustre_net.h"
 #include "../include/lu_object.h"
-#include "../../include/linux/lnet/types.h"
+#include "../../include/uapi/linux/lnet/lnet-types.h"
 #include "ptlrpc_internal.h"
 
 /* The following are visible and mutable through /sys/module/ptlrpc */