From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Apr 2017 20:12:46 +0000 (-0400)
Subject: osd/ReplicatedBackend: cleanup repop_applied
X-Git-Tag: v12.0.3~80^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=200f90b7535eb9f8788c94734a69324c98d7608f;p=ceph.git

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 b0b6053786a6..7b47688d4e3c 100644
--- 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());