From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Thu, 6 Apr 2017 10:35:52 +0000 (+0800)
Subject: osd/ReplicatedBackend: remove MOSDSubOp cruft from repop_applied
X-Git-Tag: v12.0.3~300^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21eae09c6f2ffd5291f9eac42d10b404daf1874f;p=ceph.git

osd/ReplicatedBackend: remove MOSDSubOp cruft from repop_applied

commit:52fbdc5e940d6d6bd forget remove those.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index b897eddf8157..89a2980fcba4 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -1144,24 +1144,12 @@ void ReplicatedBackend::repop_applied(RepModifyRef rm)
   Message *ack = NULL;
   eversion_t version;
 
-  if (m->get_type() == MSG_OSD_SUBOP) {
-    // doesn't have CLIENT SUBOP feature ,use Subop
-    const MOSDSubOp *req = static_cast<const MOSDSubOp*>(m);
-    version = req->version;
-    if (!rm->committed)
-      ack = new MOSDSubOpReply(
-	req, parent->whoami_shard(),
-	0, get_osdmap()->get_epoch(), CEPH_OSD_FLAG_ACK);
-  } else if (m->get_type() == MSG_OSD_REPOP) {
-    const MOSDRepOp *req = static_cast<const MOSDRepOp*>(m);
-    version = req->version;
-    if (!rm->committed)
-      ack = new MOSDRepOpReply(
+  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(), CEPH_OSD_FLAG_ACK);
-  } else {
-    ceph_abort();
-  }
 
   // send ack to acker only if we haven't sent a commit already
   if (ack) {