Commit 325da967 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: uapi: move lustre_ioctl.h to uapi directory

Move the header lustre_ioctl.h to proper uapi directory.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/24568Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarBen Evans <bevans@cray.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efd117be
...@@ -29,13 +29,12 @@ ...@@ -29,13 +29,12 @@
#define LUSTRE_IOCTL_H_ #define LUSTRE_IOCTL_H_
#include <linux/types.h> #include <linux/types.h>
#include "../../../include/linux/libcfs/libcfs.h" #include "../../../linux/libcfs/libcfs.h"
#include "lustre_idl.h" #include "../../../../lustre/include/lustre/lustre_idl.h"
#ifdef __KERNEL__ #ifdef __KERNEL__
# include <linux/ioctl.h> # include <linux/ioctl.h>
# include <linux/string.h> # include <linux/string.h>
# include "../obd_support.h"
#else /* __KERNEL__ */ #else /* __KERNEL__ */
# include <malloc.h> # include <malloc.h>
# include <string.h> # include <string.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "../include/obd_support.h" #include "../include/obd_support.h"
#include "../include/obd_class.h" #include "../include/obd_class.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/lustre_lib.h" #include "../include/lustre_lib.h"
#include "../include/lustre_dlm.h" #include "../include/lustre_dlm.h"
#include "../include/lustre_fid.h" #include "../include/lustre_fid.h"
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mount.h> #include <linux/mount.h>
#include "../include/lustre/ll_fiemap.h" #include "../include/lustre/ll_fiemap.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/lustre_swab.h" #include "../include/lustre_swab.h"
#include "../include/cl_object.h" #include "../include/cl_object.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/lustre_ha.h" #include "../include/lustre_ha.h"
#include "../include/lustre_dlm.h" #include "../include/lustre_dlm.h"
#include "../include/lprocfs_status.h" #include "../include/lprocfs_status.h"
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include "../include/lprocfs_status.h" #include "../include/lprocfs_status.h"
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lustre_fid.h" #include "../include/lustre_fid.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/lustre_kernelcomm.h" #include "../include/lustre_kernelcomm.h"
#include "lmv_internal.h" #include "lmv_internal.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "../../include/linux/libcfs/libcfs.h" #include "../../include/linux/libcfs/libcfs.h"
#include "../include/lustre/lustre_idl.h" #include "../include/lustre/lustre_idl.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lustre_dlm.h" #include "../include/lustre_dlm.h"
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include "../include/lprocfs_status.h" #include "../include/lprocfs_status.h"
#include "../include/lustre_acl.h" #include "../include/lustre_acl.h"
#include "../include/lustre_fid.h" #include "../include/lustre_fid.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/lustre_kernelcomm.h" #include "../include/lustre_kernelcomm.h"
#include "../include/lustre_lmv.h" #include "../include/lustre_lmv.h"
#include "../include/lustre_log.h" #include "../include/lustre_log.h"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "../include/lprocfs_status.h" #include "../include/lprocfs_status.h"
#include <linux/list.h> #include <linux/list.h>
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "llog_internal.h" #include "llog_internal.h"
struct obd_device *obd_devs[MAX_OBD_DEVICES]; struct obd_device *obd_devs[MAX_OBD_DEVICES];
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#include "../../include/obd_support.h" #include "../../include/obd_support.h"
#include "../../include/obd_class.h" #include "../../include/obd_class.h"
#include "../../include/lprocfs_status.h" #include "../../include/lprocfs_status.h"
#include "../../include/lustre/lustre_ioctl.h" #include "../../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../../include/lustre_ver.h" #include "../../include/lustre_ver.h"
static int obd_ioctl_is_invalid(struct obd_ioctl_data *data) static int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <linux/string.h> #include <linux/string.h>
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/llog_swab.h" #include "../include/llog_swab.h"
#include "../include/lprocfs_status.h" #include "../include/lprocfs_status.h"
#include "../include/lustre_log.h" #include "../include/lustre_log.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "../include/cl_object.h" #include "../include/cl_object.h"
#include "../include/lustre_fid.h" #include "../include/lustre_fid.h"
#include "../include/lustre_acl.h" #include "../include/lustre_acl.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/lustre_net.h" #include "../include/lustre_net.h"
#include "echo_internal.h" #include "echo_internal.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "../include/lustre_ha.h" #include "../include/lustre_ha.h"
#include "../include/lprocfs_status.h" #include "../include/lprocfs_status.h"
#include "../include/lustre/lustre_ioctl.h" #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/lustre_debug.h" #include "../include/lustre_debug.h"
#include "../include/lustre_obdo.h" #include "../include/lustre_obdo.h"
#include "../include/lustre_param.h" #include "../include/lustre_param.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment