shrink LOV EAs before replying

Branch b1_6
b=16693
i=shadow
i=johann

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 72adfe1..ea4cd3a 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -44,6 +44,12 @@ tbd Sun Microsystems, Inc.
          Lustre filesystem with 4K stack may cause a stack overflow. For more
          information, please refer to bugzilla 17630.
 
+Severity   : minor
+Frequency  : always
+Bugzilla   : 16693
+Description: shrink LOV EAs before replying   
+Details    : correctly adjust LOV EA buffer for reply.
+
 Severity   : normal
 Frequency  : rare
 Bugzilla   : 16081

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index b8c82da..9d1e347 100644 (file)
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -1886,7 +1886,7 @@ cleanup:
         }
         req->rq_status = rc;
 
-        mds_shrink_reply(obd, req, body, REPLY_REC_OFF + 1);
+        mds_shrink_reply(obd, req, body, offset + 1);
 
         /* trigger dqrel on the owner of child and parent */
         lquota_adjust(mds_quota_interface_ref, obd, qcids, qpids, rc,
@@ -2516,6 +2516,8 @@ cleanup:
         }
         req->rq_status = rc;
 
+        mds_shrink_reply(obd, req, body, offset + 1);
+
         /* acquire/release qunit */
         lquota_adjust(mds_quota_interface_ref, obd, qcids, qpids, rc,
                       FSFILT_OP_RENAME);