From: Greg Farnum <greg@inktank.com>
Date: Thu, 21 Aug 2014 02:38:45 +0000 (-0700)
Subject: Server: do not use explicit MClientReply if we don't need to
X-Git-Tag: v0.89~50^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9f8d11d2be3ee872426b94f7c230f76bd85cbed;p=ceph.git

Server: do not use explicit MClientReply if we don't need to

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index d83a54eb1577..a9a0cd410583 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -4059,9 +4059,7 @@ public:
     mds->balancer->hit_inode(mdr->get_mds_stamp(), newi, META_POP_IWR);
 
     // reply
-    MClientReply *reply = new MClientReply(mdr->client_request, 0);
-    reply->set_result(0);
-    mds->server->reply_request(mdr, reply);
+    mds->server->reply_request(mdr, 0);
   }
 };
 
@@ -4407,8 +4405,7 @@ void Server::_link_local_finish(MDRequestRef& mdr, CDentry *dn, CInode *targeti,
   mds->balancer->hit_dir(mdr->get_mds_stamp(), dn->get_dir(), META_POP_IWR);
 
   // reply
-  MClientReply *reply = new MClientReply(mdr->client_request, 0);
-  reply_request(mdr, reply);
+  reply_request(mdr, 0);
 }
 
 
@@ -4530,8 +4527,7 @@ void Server::_link_remote_finish(MDRequestRef& mdr, bool inc,
   mds->balancer->hit_dir(mdr->get_mds_stamp(), dn->get_dir(), META_POP_IWR);
 
   // reply
-  MClientReply *reply = new MClientReply(mdr->client_request, 0);
-  reply_request(mdr, reply);
+  reply_request(mdr, 0);
 
   if (!inc)
     // removing a new dn?
@@ -5093,8 +5089,7 @@ void Server::_unlink_local_finish(MDRequestRef& mdr,
   mds->balancer->hit_dir(mdr->get_mds_stamp(), dn->get_dir(), META_POP_IWR);
 
   // reply
-  MClientReply *reply = new MClientReply(mdr->client_request, 0);
-  reply_request(mdr, reply);
+  reply_request(mdr, 0);
   
   // clean up?
   if (straydn)
@@ -5926,8 +5921,7 @@ void Server::_rename_finish(MDRequestRef& mdr, CDentry *srcdn, CDentry *destdn,
   assert(g_conf->mds_kill_rename_at != 7);
 
   // reply
-  MClientReply *reply = new MClientReply(mdr->client_request, 0);
-  reply_request(mdr, reply);
+  reply_request(mdr, 0);
 
   if (need_eval)
     mds->locker->eval(in, CEPH_CAP_LOCKS, true);
@@ -7640,8 +7634,7 @@ void Server::_rmsnap_finish(MDRequestRef& mdr, CInode *diri, snapid_t snapid)
 
   // yay
   mdr->in[0] = diri;
-  MClientReply *reply = new MClientReply(mdr->client_request, 0);
-  reply_request(mdr, reply);
+  reply_request(mdr, 0);
 }