fix issues from last commit.

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index ead982e..61d368e 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -299,6 +299,7 @@ static inline struct lu_dirent *lu_dirent_next(struct lu_dirent *ent)
 #define MEA_MAGIC_LAST_CHAR      0xb2221ca1
 #define MEA_MAGIC_ALL_CHARS      0xb222a11c
 #define MEA_MAGIC_HASH_SEGMENT   0xb222a11b
+#define MAX_HASH_SIZE 0x3fffffff
 
 struct lmv_stripe_md {
         __u32         mea_magic;

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index efe7337..13964d5 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -37,7 +37,6 @@
 #endif
 
 #include <lustre/lustre_idl.h>
-#include <lustre_idl.h>
 #include <obd_support.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 24644a0..be18ad4 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -39,7 +39,6 @@
 #include <linux/ext2_fs.h>
 
 #include <lustre/lustre_idl.h>
-#include <lustre_idl.h>
 #include <lustre_log.h>
 #include <obd_support.h>
 #include <lustre_lib.h>

diff --git a/lustre/lmv/lmv_object.c b/lustre/lmv/lmv_object.c
index ddd126c..f37f5cc 100644 (file)
--- a/lustre/lmv/lmv_object.c
+++ b/lustre/lmv/lmv_object.c
@@ -40,7 +40,6 @@
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_dlm.h>
-#include <lustre_idl.h>
 #include <obd_class.h>
 #include <lprocfs_status.h>
 #include "lmv_internal.h"

diff --git a/lustre/obdclass/mea.c b/lustre/obdclass/mea.c
index 317af8d..8c123d0 100644 (file)
--- a/lustre/obdclass/mea.c
+++ b/lustre/obdclass/mea.c
@@ -33,7 +33,7 @@
 #include <obd.h>
 #endif
 #include <lprocfs_status.h>
-#include <lustre_idl.h>
+#include <lustre/lustre_idl.h>
 
 static int mea_last_char_hash(int count, char *name, int namelen)
 {