osd/ReplicatedBackend: cleanup repop_applied

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index b0b6053786a65b381ec157b6f7602886c1be3c8a..7b47688d4e3c0dd00e008ce4a4b7d83b873de1b6 100644 (file)
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -1155,19 +1155,14 @@ void ReplicatedBackend::repop_applied(RepModifyRef rm)
   dout(10) << __func__ << " on " << rm << " op "
           << *rm->op->get_req() << dendl;
   const Message *m = rm->op->get_req();
-
-  Message *ack = NULL;
-  eversion_t version;
-
   const MOSDRepOp *req = static_cast<const MOSDRepOp*>(m);
-  version = req->version;
-  if (!rm->committed)
-    ack = new MOSDRepOpReply(
-       static_cast<const MOSDRepOp*>(m), parent->whoami_shard(),
-       0, get_osdmap()->get_epoch(), req->min_epoch, CEPH_OSD_FLAG_ACK);
+  eversion_t version = req->version;
 
   // send ack to acker only if we haven't sent a commit already
-  if (ack) {
+  if (!rm->committed) {
+    Message *ack = new MOSDRepOpReply(
+      req, parent->whoami_shard(),
+      0, get_osdmap()->get_epoch(), req->min_epoch, CEPH_OSD_FLAG_ACK);
     ack->set_priority(CEPH_MSG_PRIO_HIGH); // this better match commit priority!
     get_parent()->send_message_osd_cluster(
       rm->ackerosd, ack, get_osdmap()->get_epoch());