b=20562 increase LUSTRE_SEQ_META_WIDTH to keep FLD compact

Fixed the build error for fc11 and fc12 patchless client.

i=rread

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 414d562..6f60da5 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -83,7 +83,7 @@ enum {
          * This is how many sequences may be in one super-sequence allocated to
          * MDTs.
          */
-        LUSTRE_SEQ_SUPER_WIDTH = ((1<< 30) * LUSTRE_SEQ_META_WIDTH)
+        LUSTRE_SEQ_SUPER_WIDTH = ((1ULL << 30ULL) * LUSTRE_SEQ_META_WIDTH)
 };
 
 /** special fid seq: used for local object create. */

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index ce812de..3db0c39 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -67,9 +67,9 @@
 #include <unistd.h>
 #endif
 
-#include <dirent.h>
 
 #include "llite_lib.h"
+#include <dirent.h>
 
 /* (new) readdir implementation overview can be found in lustre/llite/dir.c */