branch: b1_8_gate

reserve some space in mdt_body and mdt_rec_xxx structures and add
MDS_SETATTR64_REC to allow possible expansion of uid/gid to 64 bits
in the future.
r=adilger
r=huanghua
r=fanyong

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 50fd611..579e6d5 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -57,7 +57,7 @@ static void mdc_readdir_pack_18(struct ptlrpc_request *req, int offset,
         ENTRY;
 
         CLASSERT(sizeof(struct ll_fid)   == sizeof(struct lu_fid));
-        CLASSERT(sizeof(struct mds_body) == sizeof(struct mdt_body));
+        CLASSERT(sizeof(struct mds_body) <= sizeof(struct mdt_body));
         CLASSERT((int)offsetof(struct mds_body, max_cookiesize) == 
                  (int)offsetof(struct mdt_body, max_cookiesize));