mds: don't overwrite reply's snapbl

set_trace_dist() updates reply's snapbl, don't overwrite it. For MKSNAP
request, just need to set mdr->tracei, set_trace_dist() will set reply's
snapbl.

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index 58eb6fc4936d745c40a4d11eba0db5b6f2e167c7..a334a7b071d51960bbaf1f57395b31804ea7f18b 100644 (file)
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -203,7 +203,6 @@ struct MDRequestImpl : public MutationImpl, public TrackedOp {
   int getattr_caps;       ///< caps requested by getattr
 
   bufferlist reply_extra_bl;
-  bufferlist reply_snapbl;
 
   // inos we did a embedded cap release on, and may need to eval if we haven't since reissued
   map<vinodeno_t, ceph_seq_t> cap_releases;  

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 43180dd5ffabc4e71311897a8eb00d2558f4dc84..f8c211a11e47ed8b58abd4bcbb82105fb2597c2e 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -972,7 +972,6 @@ void Server::early_reply(MDRequestRef& mdr, CInode *tracei, CDentry *tracedn)
   }
 
   reply->set_extra_bl(mdr->reply_extra_bl);
-  assert(mdr->reply_snapbl.length() == 0); // only used on mksnap
   req->get_connection()->send_message(reply);
 
   mdr->did_early_reply = true;
@@ -1060,7 +1059,6 @@ void Server::reply_client_request(MDRequestRef& mdr, MClientReply *reply)
     // We can set the extra bl unconditionally: if it's already been sent in the
     // early_reply, set_extra_bl will have claimed it and reply_extra_bl is empty
     reply->set_extra_bl(mdr->reply_extra_bl);
-    reply->snapbl = mdr->reply_snapbl;
 
     reply->set_mdsmap_epoch(mds->mdsmap->get_epoch());
     client_con->send_message(reply);
@@ -7531,7 +7529,6 @@ void Server::_mksnap_finish(MDRequestRef& mdr, CInode *diri, SnapInfo &info)
   // yay
   mdr->in[0] = diri;
   mdr->snapid = info.snapid;
-  mdr->reply_snapbl = diri->snaprealm->get_snap_trace();
   mdr->tracei = diri;
   respond_to_request(mdr, 0);
 }