LU-6401 uapi: migrate remaining uapi headers to uapi directory

[fs/lustre-release.git] / lustre / include / uapi / linux / lustre / lustre_ostid.h

diff --git a/lustre/include/uapi/linux/lustre_ostid.h b/lustre/include/uapi/linux/lustre/lustre_ostid.h
similarity index 98%
rename from lustre/include/uapi/linux/lustre_ostid.h
rename to lustre/include/uapi/linux/lustre/lustre_ostid.h
index c0e662a..8282b09 100644 (file)
--- a/lustre/include/uapi/linux/lustre_ostid.h
+++ b/lustre/include/uapi/linux/lustre/lustre_ostid.h
@@ -34,14 +34,15 @@
 #ifndef _UAPI_LUSTRE_OSTID_H_
 #define _UAPI_LUSTRE_OSTID_H_
 
+#include <linux/errno.h>
 /*
  * This is due to us being out of kernel and the way the OpenSFS branch
- * handles CFLAGS. Upstream will just have linux/lustre_fid.h
+ * handles CFLAGS.
  */
 #ifdef __KERNEL__
-#include <uapi/linux/lustre_fid.h>
+#include <uapi/linux/lustre/lustre_fid.h>
 #else
-#include <linux/lustre_fid.h>
+#include <linux/lustre/lustre_fid.h>
 #endif
 
 static inline __u64 lmm_oi_id(const struct ost_id *oi)