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 f8061b9..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>
@@ -354,6 +346,7 @@ struct lu_dirent {
         __u64         lde_hash;
         __u16         lde_reclen;
         __u16         lde_namelen;
+        __u32         lde_pad0;
         char          lde_name[0];
 };
 
@@ -361,6 +354,7 @@ struct lu_dirpage {
         __u64            ldp_hash_start;
         __u64            ldp_hash_end;
         __u16            ldp_flags;
+        __u16            ldp_pad;
         __u32            ldp_pad0;
         struct lu_dirent ldp_entries[0];
 };