use special macro for print time_t, cleanup in includes.

[fs/lustre-release.git] / lustre / include / lustre / lustre_idl.h

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index d79772c..9ad76d4 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -54,15 +54,7 @@
 
 #include <libcfs/kp30.h>
 
-#if defined(__linux__)
-#include <linux/lustre_types.h>
-#elif defined(__APPLE__)
-#include <darwin/lustre_types.h>
-#elif defined(__WINNT__)
-#include <winnt/lustre_types.h>
-#else
-#error Unsupported operating system.
-#endif
+#include <lustre/types.h>
 
 /* Defn's shared with user-space. */
 #include <lustre/lustre_user.h>
@@ -351,16 +343,18 @@ static inline int lu_fid_eq(const struct lu_fid *f0,
  */
 struct lu_dirent {
         struct lu_fid lde_fid;
-        __u32         lde_hash;
+        __u64         lde_hash;
         __u16         lde_reclen;
         __u16         lde_namelen;
+        __u32         lde_pad0;
         char          lde_name[0];
 };
 
 struct lu_dirpage {
-        __u32            ldp_hash_start;
-        __u32            ldp_hash_end;
+        __u64            ldp_hash_start;
+        __u64            ldp_hash_end;
         __u16            ldp_flags;
+        __u16            ldp_pad;
         __u32            ldp_pad0;
         struct lu_dirent ldp_entries[0];
 };
@@ -398,7 +392,7 @@ static inline int lu_dirent_size(struct lu_dirent *ent)
         return le16_to_cpu(ent->lde_reclen);
 }
 
-#define DIR_END_OFF              0xfffffffeUL
+#define DIR_END_OFF              0xfffffffffffffffeULL
 
 struct lustre_handle {
         __u64 cookie;
@@ -871,6 +865,8 @@ struct obd_statfs {
 };
 
 extern void lustre_swab_obd_statfs (struct obd_statfs *os);
+#define OBD_STATFS_NODELAY      0x0001  /* requests should be send without delay
+                                         * and resends for avoid deadlocks */
 
 /* ost_body.data values for OST_BRW */