From 4a88de397f3d98e599a337bed891d0da713a8fd8 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Fri, 14 Nov 2008 19:43:54 +0000
Subject: [PATCH] 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

---
 lustre/mdc/mdc_reint.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
index 112ce82..1f1f445 100644
--- a/lustre/mdc/mdc_reint.c
+++ b/lustre/mdc/mdc_reint.c
@@ -130,7 +130,7 @@ int mdc_setattr(struct obd_export *exp, struct mdc_op_data *op_data,
                         [REQ_REC_OFF + 2] = ea2len,
                         [REQ_REC_OFF + 3] = sizeof(struct ldlm_request) };
         __u32 replysize[6] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
-                             [REPLY_REC_OFF] = sizeof(struct mds_body),
+                             [REPLY_REC_OFF] = sizeof(struct mdt_body),
                              [REPLY_REC_OFF+1] = obd->u.cli.cl_max_mds_easize,
                              [REPLY_REC_OFF+2] = LUSTRE_POSIX_ACL_MAX_SIZE,
                              [REPLY_REC_OFF+3] = sizeof(struct lustre_capa),
@@ -152,7 +152,6 @@ int mdc_setattr(struct obd_export *exp, struct mdc_op_data *op_data,
                 size[REQ_REC_OFF + 5] = sizeof(struct ldlm_request);
                 offset = REQ_REC_OFF + 5;
                 bufcount = 6;
-                replysize[REPLY_REC_OFF] = sizeof(struct mdt_body);
                 replybufcount = 6;
         } else {
                 bufcount = 4;
@@ -252,7 +251,7 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
         mdc_create_pack(req, REQ_REC_OFF, op_data, data, datalen, mode, uid,
                         gid, cap_effective, rdev);
 
-        size[REPLY_REC_OFF] = sizeof(struct mds_body);
+        size[REPLY_REC_OFF] = sizeof(struct mdt_body);
         size[REPLY_REC_OFF+1] = sizeof(struct ost_lvb);
         ptlrpc_req_set_repsize(req, 3, size);
 
@@ -310,7 +309,7 @@ int mdc_unlink(struct obd_export *exp, struct mdc_op_data *op_data,
                 RETURN(-ENOMEM);
         *request = req;
 
-        size[REPLY_REC_OFF] = sizeof(struct mds_body);
+        size[REPLY_REC_OFF] = sizeof(struct mdt_body);
         size[REPLY_REC_OFF + 1] = obd->u.cli.cl_max_mds_easize;
         size[REPLY_REC_OFF + 2] = obd->u.cli.cl_max_mds_cookiesize;
         ptlrpc_req_set_repsize(req, 4, size);
@@ -361,7 +360,7 @@ int mdc_link(struct obd_export *exp, struct mdc_op_data *op_data,
 
         mdc_link_pack(req, REQ_REC_OFF, op_data);
 
-        size[REPLY_REC_OFF] = sizeof(struct mds_body);
+        size[REPLY_REC_OFF] = sizeof(struct mdt_body);
         ptlrpc_req_set_repsize(req, 2, size);
 
         rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL);
@@ -419,7 +418,7 @@ int mdc_rename(struct obd_export *exp, struct mdc_op_data *op_data,
 
         mdc_rename_pack(req, REQ_REC_OFF, op_data, old, oldlen, new, newlen);
 
-        size[REPLY_REC_OFF] = sizeof(struct mds_body);
+        size[REPLY_REC_OFF] = sizeof(struct mdt_body);
         size[REPLY_REC_OFF + 1] = obd->u.cli.cl_max_mds_easize;
         size[REPLY_REC_OFF + 2] = obd->u.cli.cl_max_mds_cookiesize;
         ptlrpc_req_set_repsize(req, 4, size);
-- 
1.8.3.1