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

Move all the remaining lustre headers shared between user land
and kernel space to the uapi directory.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/25246
Reviewed-by: Quentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.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/uapi/linux/lustre/lustre_cfg.h

@@ -35,7 +35,7 @@
 
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include "../../../../lustre/include/lustre/lustre_user.h"
+#include "../../../uapi/linux/lustre/lustre_user.h"
 
 /** \defgroup cfg cfg
  *

drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h

@@ -37,7 +37,7 @@
 #ifndef _UAPI_LUSTRE_FID_H_
 #define _UAPI_LUSTRE_FID_H_
 
-#include "../../../../lustre/include/lustre/lustre_idl.h"
+#include "../../../uapi/linux/lustre/lustre_idl.h"
 
 /** returns fid object sequence */
 static inline __u64 fid_seq(const struct lu_fid *fid)

drivers/staging/lustre/include/uapi/linux/lustre/lustre_fiemap.h

@@ -29,8 +29,6 @@
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
- * lustre/include/lustre/ll_fiemap.h
- *
  * FIEMAP data structures and flags. This header file will be used until
  * fiemap.h is available in the upstream kernel.
  *
@@ -41,10 +39,8 @@
 #ifndef _LUSTRE_FIEMAP_H
 #define _LUSTRE_FIEMAP_H
 
-#ifndef __KERNEL__
 #include <stddef.h>
-#include <fiemap.h>
-#endif
+#include <linux/fiemap.h>
 
 /* XXX: We use fiemap_extent::fe_reserved[0] */
 #define fe_device	fe_reserved[0]

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

@@ -29,8 +29,6 @@
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
- * lustre/include/lustre/lustre_idl.h
- *
  * Lustre wire protocol definitions.
  */
 
@@ -71,10 +69,10 @@
 
 #include <linux/types.h>
 
-#include "../../../include/uapi/linux/lnet/lnet-types.h"
+#include "../lnet/lnet-types.h"
 /* Defn's shared with user-space. */
 #include "lustre_user.h"
-#include "../lustre_ver.h"
+#include "lustre_ver.h"
 
 /*
  *  GENERAL STUFF

drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h

@@ -31,7 +31,7 @@
 #include <linux/ioctl.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include "../../../../lustre/include/lustre/lustre_idl.h"
+#include "../../../uapi/linux/lustre/lustre_idl.h"
 
 #if !defined(__KERNEL__) && !defined(LUSTRE_UTILS)
 # error This file is for Lustre internal use only.

drivers/staging/lustre/include/uapi/linux/lustre/lustre_kernelcomm.h

@@ -34,8 +34,8 @@
  * The definitions below are used in the kernel and userspace.
  */
 
-#ifndef __UAPI_KERNELCOMM_H__
-#define __UAPI_KERNELCOMM_H__
+#ifndef __UAPI_LUSTRE_KERNELCOMM_H__
+#define __UAPI_LUSTRE_KERNELCOMM_H__
 
 #include <linux/types.h>
 
@@ -91,4 +91,4 @@ struct lustre_kernelcomm {
 	__u32 lk_flags;
 } __packed;
 
-#endif	/* __UAPI_KERNELCOMM_H__ */
+#endif	/* __UAPI_LUSTRE_KERNELCOMM_H__ */

drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h

@@ -36,7 +36,6 @@
 
 #include <linux/errno.h>
 #include "lustre_fid.h"
-#include "../../../../lustre/include/lustre/lustre_idl.h"
 
 static inline __u64 lmm_oi_id(const struct ost_id *oi)
 {

drivers/staging/lustre/include/uapi/linux/lustre/lustre_user.h

@@ -55,7 +55,7 @@
 # include <sys/quota.h>
 # include <sys/stat.h>
 #endif /* __KERNEL__ */
-#include "ll_fiemap.h"
+#include "lustre_fiemap.h"
 
 /*
  * We need to always use 64bit version because the structure

drivers/staging/lustre/lustre/fid/fid_internal.h

@@ -36,7 +36,7 @@
 #ifndef __FID_INTERNAL_H
 #define __FID_INTERNAL_H
 
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../../include/linux/libcfs/libcfs.h"
 
 /* Functions used internally in module. */

drivers/staging/lustre/lustre/fid/fid_lib.c

@@ -41,7 +41,6 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include <linux/module.h>
-#include "../include/lustre/lustre_idl.h"
 #include "../include/lustre_fid.h"
 
 /**

drivers/staging/lustre/lustre/fld/fld_cache.c

@@ -45,7 +45,7 @@
 
 #include "../include/obd.h"
 #include "../include/obd_class.h"
-#include "../include/lustre_ver.h"
+#include "../../include/uapi/linux/lustre/lustre_ver.h"
 #include "../include/obd_support.h"
 #include "../include/lprocfs_status.h"
 

drivers/staging/lustre/lustre/fld/fld_internal.h

@@ -56,7 +56,7 @@
 #ifndef __FLD_INTERNAL_H
 #define __FLD_INTERNAL_H
 
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../include/lustre_req_layout.h"

drivers/staging/lustre/lustre/fld/fld_request.c

@@ -44,7 +44,7 @@
 
 #include "../include/obd.h"
 #include "../include/obd_class.h"
-#include "../include/lustre_ver.h"
+#include "../../include/uapi/linux/lustre/lustre_ver.h"
 #include "../include/obd_support.h"
 #include "../include/lprocfs_status.h"
 

drivers/staging/lustre/lustre/include/llog_swab.h

@@ -48,7 +48,8 @@
 #ifndef _LLOG_SWAB_H_
 #define _LLOG_SWAB_H_
 
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
+
 struct lustre_cfg;
 
 void lustre_swab_lu_fid(struct lu_fid *fid);

drivers/staging/lustre/lustre/include/lprocfs_status.h

@@ -45,7 +45,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/uapi/linux/lustre/lustre_cfg.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 struct lprocfs_vars {
 	const char		*name;

drivers/staging/lustre/lustre/include/lu_object.h

@@ -36,7 +36,7 @@
 #include <stdarg.h>
 #include <linux/percpu_counter.h>
 #include "../../include/linux/libcfs/libcfs.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "lu_ref.h"
 
 struct seq_file;

drivers/staging/lustre/lustre/include/lustre_export.h

@@ -43,7 +43,7 @@
  */
 
 #include "lprocfs_status.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "lustre_dlm.h"
 
 enum obd_option {

drivers/staging/lustre/lustre/include/lustre_fid.h

@@ -150,7 +150,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/uapi/linux/lustre/lustre_fid.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../../include/uapi/linux/lustre/lustre_ostid.h"
 
 struct lu_env;

drivers/staging/lustre/lustre/include/lustre_fld.h

@@ -38,7 +38,7 @@
  * @{
  */
 
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../../include/linux/libcfs/libcfs.h"
 #include "seq_range.h"
 

drivers/staging/lustre/lustre/include/lustre_import.h

@@ -44,7 +44,7 @@
  */
 
 #include "lustre_handles.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 /**
  * Adaptive Timeout stuff

drivers/staging/lustre/lustre/include/lustre_kernelcomm.h

@@ -38,7 +38,7 @@
 #define __LUSTRE_KERNELCOMM_H__
 
 /* For declarations shared with userspace */
-#include "uapi_kernelcomm.h"
+#include "../../include/uapi/linux/lustre/lustre_kernelcomm.h"
 
 /* prototype for callback function on kuc groups */
 typedef int (*libcfs_kkuc_cb_t)(void *data, void *cb_arg);

drivers/staging/lustre/lustre/include/lustre_lib.h

@@ -46,8 +46,8 @@
 #include <linux/signal.h>
 #include <linux/types.h>
 #include "../../include/linux/libcfs/libcfs.h"
-#include "lustre/lustre_idl.h"
-#include "lustre_ver.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_ver.h"
 #include "../../include/uapi/linux/lustre/lustre_cfg.h"
 
 /* target.c */

drivers/staging/lustre/lustre/include/lustre_lmv.h

@@ -32,7 +32,7 @@
 
 #ifndef _LUSTRE_LMV_H
 #define _LUSTRE_LMV_H
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 struct lmv_oinfo {
 	struct lu_fid	lmo_fid;

drivers/staging/lustre/lustre/include/lustre_log.h

@@ -53,7 +53,7 @@
  */
 
 #include "obd_class.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 #define LOG_NAME_LIMIT(logname, name)		   \
 	snprintf(logname, sizeof(logname), "LOGS/%s", name)

drivers/staging/lustre/lustre/include/lustre_mdc.h

@@ -50,7 +50,6 @@
 #include "lustre_handles.h"
 #include "../../include/linux/libcfs/libcfs.h"
 #include "obd_class.h"
-#include "lustre/lustre_idl.h"
 #include "lustre_lib.h"
 #include "lustre_dlm.h"
 #include "lustre_export.h"

drivers/staging/lustre/lustre/include/lustre_mds.h

@@ -45,7 +45,6 @@
 
 #include "lustre_handles.h"
 #include "../../include/linux/libcfs/libcfs.h"
-#include "lustre/lustre_idl.h"
 #include "lustre_lib.h"
 #include "lustre_dlm.h"
 #include "lustre_export.h"

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

@@ -54,7 +54,8 @@
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/uapi/linux/lnet/nidstr.h"
 #include "../../include/linux/lnet/api.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
+#include "lustre_errno.h"
 #include "lustre_ha.h"
 #include "lustre_sec.h"
 #include "lustre_import.h"
@@ -63,7 +64,7 @@
 #include "lustre_req_layout.h"
 
 #include "obd_support.h"
-#include "lustre_ver.h"
+#include "../../include/uapi/linux/lustre/lustre_ver.h"
 
 /* MD flags we _always_ use */
 #define PTLRPC_MD_OPTIONS  0

drivers/staging/lustre/lustre/include/lustre_obdo.h

@@ -35,7 +35,7 @@
 #ifndef _LUSTRE_OBDO_H_
 #define _LUSTRE_OBDO_H_
 
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 /**
  * Create an obdo to send over the wire

drivers/staging/lustre/lustre/include/lustre_swab.h

@@ -48,7 +48,7 @@
 #ifndef _LUSTRE_SWAB_H_
 #define _LUSTRE_SWAB_H_
 
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
 void lustre_swab_connect(struct obd_connect_data *ocd);

drivers/staging/lustre/lustre/include/obd.h

@@ -35,7 +35,7 @@
 
 #include <linux/spinlock.h>
 
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "lustre_lib.h"
 #include "lu_ref.h"
 #include "lustre_export.h"

drivers/staging/lustre/lustre/include/obd_cksum.h

@@ -32,7 +32,7 @@
 #define __OBD_CKSUM
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/linux/libcfs/libcfs_crypto.h"
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 static inline unsigned char cksum_obd2cfs(enum cksum_type cksum_type)
 {

drivers/staging/lustre/lustre/include/obd_class.h

@@ -37,7 +37,6 @@
 #include "lustre_net.h"
 #include "obd.h"
 #include "lustre_lib.h"
-#include "lustre/lustre_idl.h"
 #include "lprocfs_status.h"
 
 #define OBD_STATFS_NODELAY      0x0001  /* requests should be send without delay

drivers/staging/lustre/lustre/include/seq_range.h

@@ -34,7 +34,7 @@
 #ifndef _SEQ_RANGE_H_
 #define _SEQ_RANGE_H_
 
-#include "lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 /**
  * computes the sequence range type \a range

drivers/staging/lustre/lustre/ldlm/ldlm_request.c

@@ -57,8 +57,7 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include "../include/lustre/lustre_errno.h"
-
+#include "../include/lustre_errno.h"
 #include "../include/lustre_dlm.h"
 #include "../include/obd_class.h"
 #include "../include/obd.h"

drivers/staging/lustre/lustre/llite/dcache.c

@@ -37,7 +37,7 @@
 #define DEBUG_SUBSYSTEM S_LLITE
 
 #include "../include/obd_support.h"
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/lustre_dlm.h"
 
 #include "llite_internal.h"

drivers/staging/lustre/lustre/llite/file.c

@@ -42,7 +42,7 @@
 #include <linux/file.h>
 #include <linux/sched.h>
 #include <linux/mount.h>
-#include "../include/lustre/ll_fiemap.h"
+#include "../../include/uapi/linux/lustre/lustre_fiemap.h"
 #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
 #include "../include/lustre_swab.h"
 

drivers/staging/lustre/lustre/llite/lcommon_cl.c

@@ -50,7 +50,6 @@
 #include "../include/obd_support.h"
 #include "../include/lustre_fid.h"
 #include "../include/lustre_dlm.h"
-#include "../include/lustre_ver.h"
 #include "../include/lustre_mdc.h"
 #include "../include/cl_object.h"
 

drivers/staging/lustre/lustre/llite/llite_internal.h

@@ -33,7 +33,7 @@
 #ifndef LLITE_INTERNAL_H
 #define LLITE_INTERNAL_H
 #include "../include/lustre_debug.h"
-#include "../include/lustre_ver.h"
+#include "../../include/uapi/linux/lustre/lustre_ver.h"
 #include "../include/lustre_disk.h"	/* for s2sbi */
 #include "../include/lustre_linkea.h"
 

drivers/staging/lustre/lustre/llite/namei.c

@@ -43,7 +43,6 @@
 #include "../include/obd_support.h"
 #include "../include/lustre_fid.h"
 #include "../include/lustre_dlm.h"
-#include "../include/lustre_ver.h"
 #include "llite_internal.h"
 
 static int ll_create_it(struct inode *dir, struct dentry *dentry,

drivers/staging/lustre/lustre/llite/range_lock.c

@@ -34,7 +34,7 @@
  * Author: Bobi Jam <bobijam.xu@intel.com>
  */
 #include "range_lock.h"
-#include "../include/lustre/lustre_user.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 /**
  * Initialize a range lock tree

drivers/staging/lustre/lustre/llite/vvp_internal.h

@@ -37,7 +37,7 @@
 #ifndef VVP_INTERNAL_H
 #define VVP_INTERNAL_H
 
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/cl_object.h"
 
 enum obd_notify_event;

drivers/staging/lustre/lustre/llite/xattr.c

@@ -40,7 +40,6 @@
 
 #include "../include/obd_support.h"
 #include "../include/lustre_dlm.h"
-#include "../include/lustre_ver.h"
 
 #include "llite_internal.h"
 

drivers/staging/lustre/lustre/llite/xattr_cache.c

@@ -14,7 +14,6 @@
 #include <linux/mm.h>
 #include "../include/obd_support.h"
 #include "../include/lustre_dlm.h"
-#include "../include/lustre_ver.h"
 #include "llite_internal.h"
 
 /* If we ever have hundreds of extended attributes, we might want to consider

drivers/staging/lustre/lustre/lmv/lmv_fld.c

@@ -38,7 +38,6 @@
 #include <linux/seq_file.h>
 
 #include "../include/obd_support.h"
-#include "../include/lustre/lustre_idl.h"
 #include "../include/lustre_fid.h"
 #include "../include/lustre_lib.h"
 #include "../include/lustre_net.h"

drivers/staging/lustre/lustre/lmv/lmv_intent.c

@@ -39,7 +39,6 @@
 #include <linux/namei.h>
 #include "../include/lustre_intent.h"
 #include "../include/obd_support.h"
-#include "../include/lustre/lustre_idl.h"
 #include "../include/lustre_lib.h"
 #include "../include/lustre_net.h"
 #include "../include/lustre_dlm.h"

drivers/staging/lustre/lustre/lmv/lmv_internal.h

@@ -33,7 +33,7 @@
 #ifndef _LMV_INTERNAL_H_
 #define _LMV_INTERNAL_H_
 
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/obd.h"
 #include "../include/lustre_lmv.h"
 

drivers/staging/lustre/lustre/lmv/lmv_obd.c

@@ -41,7 +41,6 @@
 #include <linux/namei.h>
 #include <linux/uaccess.h>
 
-#include "../include/lustre/lustre_idl.h"
 #include "../include/obd_support.h"
 #include "../include/lustre_net.h"
 #include "../include/obd_class.h"

drivers/staging/lustre/lustre/lov/lov_ea.c

@@ -40,7 +40,7 @@
 #include "../../include/linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 #include "lov_internal.h"
 

drivers/staging/lustre/lustre/lov/lov_internal.h

@@ -34,7 +34,7 @@
 #define LOV_INTERNAL_H
 
 #include "../include/obd_class.h"
-#include "../include/lustre/lustre_user.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 /*
  * If we are unable to get the maximum object size from the OST in

drivers/staging/lustre/lustre/lov/lov_obd.c

@@ -40,7 +40,7 @@
 #define DEBUG_SUBSYSTEM S_LOV
 #include "../../include/linux/libcfs/libcfs.h"
 
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
 
 #include "../include/cl_object.h"

drivers/staging/lustre/lustre/lov/lov_pack.c

@@ -38,9 +38,6 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#include "../include/lustre/lustre_idl.h"
-#include "../include/lustre/lustre_user.h"
-
 #include "../include/lustre_net.h"
 #include "../include/lustre_swab.h"
 #include "../include/obd.h"

drivers/staging/lustre/lustre/lov/lov_request.c

@@ -35,7 +35,7 @@
 #include "../../include/linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "lov_internal.h"
 
 static void lov_init_set(struct lov_request_set *set)

drivers/staging/lustre/lustre/mdc/mdc_lib.c

@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_MDC
 #include "../include/lustre_net.h"
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "mdc_internal.h"
 
 static void set_mrc_cr_flags(struct mdt_rec_create *mrc, u64 flags)

drivers/staging/lustre/lustre/mdc/mdc_request.c

@@ -38,8 +38,7 @@
 # include <linux/init.h>
 # include <linux/utsname.h>
 
-#include "../include/lustre/lustre_errno.h"
-
+#include "../include/lustre_errno.h"
 #include "../include/cl_object.h"
 #include "../include/llog_swab.h"
 #include "../include/lprocfs_status.h"

drivers/staging/lustre/lustre/mgc/mgc_internal.h

@@ -34,7 +34,6 @@
 #define _MGC_INTERNAL_H
 
 #include "../../include/linux/libcfs/libcfs.h"
-#include "../include/lustre/lustre_idl.h"
 #include "../include/lustre_lib.h"
 #include "../include/lustre_dlm.h"
 #include "../include/lustre_log.h"

drivers/staging/lustre/lustre/obdclass/linkea.c

@@ -26,7 +26,7 @@
  * Author: Di Wang <di.wang@intel.com>
  */
 
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/obd.h"
 #include "../include/lustre_linkea.h"
 

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

@@ -66,7 +66,7 @@
 #include "../../include/obd_class.h"
 #include "../../include/lprocfs_status.h"
 #include "../../../include/uapi/linux/lustre/lustre_ioctl.h"
-#include "../../include/lustre_ver.h"
+#include "../../../include/uapi/linux/lustre/lustre_ver.h"
 
 static int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
 {

drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

@@ -38,7 +38,7 @@
 
 #include "../include/obd_class.h"
 #include "../include/lprocfs_status.h"
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include <linux/seq_file.h>
 #include <linux/ctype.h>
 

drivers/staging/lustre/lustre/obdclass/obd_mount.c

@@ -43,7 +43,7 @@
 #include "../include/obd.h"
 #include "../include/lustre_compat.h"
 #include "../include/obd_class.h"
-#include "../include/lustre/lustre_user.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/lustre_log.h"
 #include "../include/lustre_disk.h"
 #include "../../include/uapi/linux/lustre/lustre_param.h"

drivers/staging/lustre/lustre/obdclass/obdo.c

@@ -39,7 +39,7 @@
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include "../include/obd_class.h"
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/lustre_obdo.h"
 
 void obdo_set_parent_fid(struct obdo *dst, const struct lu_fid *parent)

drivers/staging/lustre/lustre/osc/osc_request.c

@@ -36,7 +36,7 @@
 
 #include "../include/lustre_dlm.h"
 #include "../include/lustre_net.h"
-#include "../include/lustre/lustre_user.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/obd_cksum.h"
 
 #include "../include/lustre_ha.h"

drivers/staging/lustre/lustre/ptlrpc/errno.c

@@ -26,7 +26,7 @@
  */
 
 #include "../../include/linux/libcfs/libcfs.h"
-#include "../include/lustre/lustre_errno.h"
+#include "../include/lustre_errno.h"
 
 /*
  * The two translation tables below must define a one-to-one mapping between

drivers/staging/lustre/lustre/ptlrpc/layout.c

@@ -46,12 +46,12 @@
 
 #include <linux/module.h>
 
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 
 #include "../include/llog_swab.h"
 #include "../include/lustre_debug.h"
 #include "../include/lustre_swab.h"
-#include "../include/lustre_ver.h"
+#include "../../include/uapi/linux/lustre/lustre_ver.h"
 #include "../include/obd.h"
 #include "../include/obd_support.h"
 

drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c

@@ -34,7 +34,7 @@
 #include "../include/obd_support.h"
 #include "../include/obd.h"
 #include "../include/lprocfs_status.h"
-#include "../include/lustre/lustre_idl.h"
+#include "../../include/uapi/linux/lustre/lustre_idl.h"
 #include "../include/lustre_net.h"
 #include "../include/obd_class.h"
 #include "ptlrpc_internal.h"

drivers/staging/lustre/lustre/ptlrpc/pack_generic.c

@@ -42,7 +42,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 
-#include "../include/lustre/ll_fiemap.h"
+#include "../../include/uapi/linux/lustre/lustre_fiemap.h"
 
 #include "../include/llog_swab.h"
 #include "../include/lustre_net.h"