From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Mar 2017 18:12:26 +0000 (-0400)
Subject: osd/ReplicatedBackend: rename sub_op_modify* do_repop*
X-Git-Tag: v12.0.2~219^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ecf7b0ba150521d97cf23776ee8a190452f3c4c;p=ceph.git

osd/ReplicatedBackend: rename sub_op_modify* do_repop*

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

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index a04f140f9f47..46ea89dd334a 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -66,7 +66,7 @@ struct ReplicatedBackend::C_OSD_RepModifyApply : public Context {
   C_OSD_RepModifyApply(ReplicatedBackend *pg, RepModifyRef r)
     : pg(pg), rm(r) {}
   void finish(int r) override {
-    pg->sub_op_modify_applied(rm);
+    pg->repop_applied(rm);
   }
 };
 
@@ -76,7 +76,7 @@ struct ReplicatedBackend::C_OSD_RepModifyCommit : public Context {
   C_OSD_RepModifyCommit(ReplicatedBackend *pg, RepModifyRef r)
     : pg(pg), rm(r) {}
   void finish(int r) override {
-    pg->sub_op_modify_commit(rm);
+    pg->repop_commit(rm);
   }
 };
 
@@ -215,12 +215,12 @@ bool ReplicatedBackend::handle_message(
   }
 
   case MSG_OSD_REPOP: {
-    sub_op_modify(op);
+    do_repop(op);
     return true;
   }
 
   case MSG_OSD_REPOPREPLY: {
-    sub_op_modify_reply(op);
+    do_repop_reply(op);
     return true;
   }
 
@@ -621,7 +621,7 @@ void ReplicatedBackend::op_commit(
   }
 }
 
-void ReplicatedBackend::sub_op_modify_reply(OpRequestRef op)
+void ReplicatedBackend::do_repop_reply(OpRequestRef op)
 {
   static_cast<MOSDRepOpReply*>(op->get_nonconst_req())->finish_decode();
   const MOSDRepOpReply *r = static_cast<const MOSDRepOpReply *>(op->get_req());
@@ -1045,7 +1045,7 @@ void ReplicatedBackend::issue_op(
 }
 
 // sub op modify
-void ReplicatedBackend::sub_op_modify(OpRequestRef op)
+void ReplicatedBackend::do_repop(OpRequestRef op)
 {
   static_cast<MOSDRepOp*>(op->get_nonconst_req())->finish_decode();
   const MOSDRepOp *m = static_cast<const MOSDRepOp *>(op->get_req());
@@ -1132,7 +1132,7 @@ void ReplicatedBackend::sub_op_modify(OpRequestRef op)
   // op is cleaned up by oncommit/onapply when both are executed
 }
 
-void ReplicatedBackend::sub_op_modify_applied(RepModifyRef rm)
+void ReplicatedBackend::repop_applied(RepModifyRef rm)
 {
   rm->op->mark_event("sub_op_applied");
   rm->applied = true;
@@ -1173,7 +1173,7 @@ void ReplicatedBackend::sub_op_modify_applied(RepModifyRef rm)
   parent->op_applied(version);
 }
 
-void ReplicatedBackend::sub_op_modify_commit(RepModifyRef rm)
+void ReplicatedBackend::repop_commit(RepModifyRef rm)
 {
   rm->op->mark_commit_sent();
   rm->committed = true;
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 2003083e5c54..55966325f54c 100644
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -405,8 +405,8 @@ private:
     ObjectStore::Transaction &op_t);
   void op_applied(InProgressOp *op);
   void op_commit(InProgressOp *op);
-  void sub_op_modify_reply(OpRequestRef op);
-  void sub_op_modify(OpRequestRef op);
+  void do_repop_reply(OpRequestRef op);
+  void do_repop(OpRequestRef op);
 
   struct RepModify {
     OpRequestRef op;
@@ -425,8 +425,8 @@ private:
   struct C_OSD_RepModifyApply;
   struct C_OSD_RepModifyCommit;
 
-  void sub_op_modify_applied(RepModifyRef rm);
-  void sub_op_modify_commit(RepModifyRef rm);
+  void repop_applied(RepModifyRef rm);
+  void repop_commit(RepModifyRef rm);
   bool scrub_supported() override { return true; }
   bool auto_repair_supported() const override { return false; }