From: jimifm <hong.zhangoole@gmail.com>
Date: Mon, 22 Aug 2016 12:31:19 +0000 (+0800)
Subject: osd/ReplicatedPG:wipe off param op from generate_subop()
X-Git-Tag: v11.0.1~399^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00719f4579cf9ffa58c779b24a6f635feff2b85e;p=ceph.git

osd/ReplicatedPG:wipe off param op from generate_subop()

Signed-off-by: jimifm <hong.zhangoole@gmail.com>
---

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 2bd645bfd104d..59beb92351a8a 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -993,7 +993,6 @@ Message * ReplicatedBackend::generate_subop(
   hobject_t discard_temp_oid,
   const vector<pg_log_entry_t> &log_entries,
   boost::optional<pg_hit_set_history_t> &hset_hist,
-  InProgressOp *op,
   ObjectStore::Transaction &op_t,
   pg_shard_t peer,
   const pg_info_t &pinfo)
@@ -1079,7 +1078,6 @@ void ReplicatedBackend::issue_op(
       discard_temp_oid,
       log_entries,
       hset_hist,
-      op,
       op_t,
       peer,
       pinfo);
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 922b99d8001a1..ce127f2d87423 100644
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -371,7 +371,6 @@ private:
     hobject_t discard_temp_oid,
     const vector<pg_log_entry_t> &log_entries,
     boost::optional<pg_hit_set_history_t> &hset_history,
-    InProgressOp *op,
     ObjectStore::Transaction &op_t,
     pg_shard_t peer,
     const pg_info_t &pinfo);