From cfac5c331960276e127a400ddfcbd220c5ca0021 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 20 Aug 2014 20:12:00 -0700 Subject: [PATCH] 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 --- src/mds/Server.cc | 8 ++++---- src/mds/Server.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index e59f6c5d15889..d3f08f88f3e82 100644 --- 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 f5c23ebfd3d8a..f85fd6dc22b72 100644 --- 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 -- 2.39.5