LU-13805 llite: Implement unaligned DIO connect flag

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

diff --git a/lustre/include/uapi/linux/lustre/lustre_ostid.h b/lustre/include/uapi/linux/lustre/lustre_ostid.h
index 4a96640..baf7c8f 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_ostid.h
+++ b/lustre/include/uapi/linux/lustre/lustre_ostid.h
@@ -36,15 +36,7 @@
 
 #include <linux/errno.h>
 #include <linux/types.h>
-/*
- * This is due to us being out of kernel and the way the OpenSFS branch
- * handles CFLAGS.
- */
-#ifdef __KERNEL__
-#include <uapi/linux/lustre/lustre_fid.h>
-#else
 #include <linux/lustre/lustre_fid.h>
-#endif
 
 static inline __u64 lmm_oi_id(const struct ost_id *oi)
 {
@@ -99,7 +91,7 @@ static inline __u64 ostid_seq(const struct ost_id *ostid)
 static inline __u64 ostid_id(const struct ost_id *ostid)
 {
        if (fid_seq_is_mdt0(ostid->oi.oi_seq))
-               return ostid->oi.oi_id & IDIF_OID_MASK;
+               return ostid->oi.oi_id & IDIF_MAX_OID;
 
        if (fid_seq_is_default(ostid->oi.oi_seq))
                return ostid->oi.oi_id;
@@ -220,7 +212,7 @@ static inline int ostid_to_fid(struct lu_fid *fid, const struct ost_id *ostid,
                 * been in production for years.  This can handle create rates
                 * of 1M objects/s/OST for 9 years, or combinations thereof.
                 */
-               if (oid >= IDIF_MAX_OID)
+               if (oid > IDIF_MAX_OID)
                        return -EBADF;
 
                fid->f_seq = fid_idif_seq(oid, ost_idx);