msg: rename MClientReply::dir_bl to extra_bl. Fix uses

diff --git a/src/client/Client.cc b/src/client/Client.cc
index e646878a2a5b77a2577cbe93c5eea65cc57fe90c..a69ffbcb009a9b4157b9fea2ba999658d7600605 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -688,7 +688,7 @@ Inode* Client::insert_trace(MetaRequest *request, utime_t from, int mds)
   // insert readdir results too
 
   // the rest?
-  p = reply->get_dir_bl().begin();
+  p = reply->get_extra_bl().begin();
   if (!p.end()) {
     // only open dir if we're actually adding stuff to it!
     Dir *dir = in->open_dir();
@@ -932,7 +932,7 @@ int Client::make_request(MetaRequest *request,
 
   int r = reply->get_result();
   if (pdirbl)
-    pdirbl->claim(reply->get_dir_bl());
+    pdirbl->claim(reply->get_extra_bl());
   reply->put();
   return r;
 }

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 75ff6405a171f0451fe366950d2b4c1d32bc3cf1..b1da59550d8cd2cb19f205399f6b85eb455a7a33 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2495,7 +2495,9 @@ void Server::handle_client_readdir(MDRequest *mdr)
           << " complete=" << (int)complete
           << dendl;
   MClientReply *reply = new MClientReply(req, 0);
-  reply->set_dir_bl(dirbl);
+  reply->set_extra_bl(dirbl);
+  dout(10) << "reply to " << *req << " readdir num=" << numfiles << " end=" << (int)end
+          << " complete=" << (int)complete << dendl;
 
   // bump popularity.  NOTE: this doesn't quite capture it.
   mds->balancer->hit_dir(g_clock.now(), dir, META_POP_IRD, -1, numfiles);
@@ -5464,7 +5466,7 @@ void Server::handle_client_lssnap(MDRequest *mdr)
   dirbl.claim_append(dnbl);
   
   MClientReply *reply = new MClientReply(req);
-  reply->set_dir_bl(dirbl);
+  reply->set_extra_bl(dirbl);
   reply_request(mdr, reply, diri);
 }
 

diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index 2ea4916e81280f3d7e5b1b92dec3a37b5599cc53..4d2d444c580f9e1df93ac4cfc6cfd62f7275f027 100644 (file)
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -173,7 +173,7 @@ class MClientReply : public Message {
 public:
   struct ceph_mds_reply_head head;
   bufferlist trace_bl;
-  bufferlist dir_bl;
+  bufferlist extra_bl;
   bufferlist snapbl;
 
  public:
@@ -225,24 +225,24 @@ public:
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode(trace_bl, p);
-    ::decode(dir_bl, p);
+    ::decode(extra_bl, p);
     ::decode(snapbl, p);
     assert(p.end());
   }
   virtual void encode_payload() {
     ::encode(head, payload);
     ::encode(trace_bl, payload);
-    ::encode(dir_bl, payload);
+    ::encode(extra_bl, payload);
     ::encode(snapbl, payload);
   }
 
 
   // dir contents
-  void set_dir_bl(bufferlist& bl) {
-    dir_bl.claim(bl);
+  void set_extra_bl(bufferlist& bl) {
+    extra_bl.claim(bl);
   }
-  bufferlist &get_dir_bl() {
-    return dir_bl;
+  bufferlist &get_extra_bl() {
+    return extra_bl;
   }
 
   // trace