Server: rename reply_request -> reply_client_request; make it private

The generic reply_request(MDRequest, int) is now the only caller. It's still
just building an MClientRequest to pass along, but we can change it a lot more
easily now to support responding to non-client requests.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index e59f6c5d158897cb41aa99d5da55ff938b71ffc5..d3f08f88f3e82ff4fd865e75d96182d6379d5255 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -899,11 +899,11 @@ void Server::submit_mdlog_entry(LogEvent *le, MDSInternalContextBase *fin, MDReq
 }
 
 /*
- * send generic response (just an error code), clean up mdr
+ * send response built from mdr contents and error code; clean up mdr
  */
 void Server::reply_request(MDRequestRef& mdr, int r)
 {
-  reply_request(mdr, new MClientReply(mdr->client_request, r));
+  reply_client_request(mdr, new MClientReply(mdr->client_request, r));
 }
 
 void Server::early_reply(MDRequestRef& mdr, CInode *tracei, CDentry *tracedn)
@@ -978,12 +978,12 @@ void Server::early_reply(MDRequestRef& mdr, CInode *tracei, CDentry *tracedn)
  * include a trace to tracei
  * Clean up mdr
  */
-void Server::reply_request(MDRequestRef& mdr, MClientReply *reply)
+void Server::reply_client_request(MDRequestRef& mdr, MClientReply *reply)
 {
   assert(mdr.get());
   MClientRequest *req = mdr->client_request;
   
-  dout(10) << "reply_request " << reply->get_result() 
+  dout(10) << "reply_client_request " << reply->get_result() 
           << " (" << cpp_strerror(reply->get_result())
           << ") " << *req << dendl;
 

diff --git a/src/mds/Server.h b/src/mds/Server.h
index f5c23ebfd3d8a8c4c0bd82170965f44101ae698e..f85fd6dc22b729df000e097f4cbf75352f2a9f54 100644 (file)
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@ -113,7 +113,6 @@ public:
   void dispatch_client_request(MDRequestRef& mdr);
   void early_reply(MDRequestRef& mdr, CInode *tracei, CDentry *tracedn);
   void reply_request(MDRequestRef& mdr, int r = 0);
-  void reply_request(MDRequestRef& mdr, MClientReply *reply);
   void set_trace_dist(Session *session, MClientReply *reply, CInode *in, CDentry *dn,
                      snapid_t snapid,
                      int num_dentries_wanted,
@@ -262,6 +261,8 @@ public:
   void _rename_rollback_finish(MutationRef& mut, MDRequestRef& mdr, CDentry *srcdn, version_t srcdnpv,
                               CDentry *destdn, CDentry *staydn, bool finish_mdr);
 
+private:
+  void reply_client_request(MDRequestRef& mdr, MClientReply *reply);
 };
 
 #endif