]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/ReplicatedPG:wipe off param op from generate_subop()
authorjimifm <hong.zhangoole@gmail.com>
Mon, 22 Aug 2016 12:31:19 +0000 (20:31 +0800)
committerjimifm <hong.zhangoole@gmail.com>
Mon, 22 Aug 2016 12:31:19 +0000 (20:31 +0800)
Signed-off-by: jimifm <hong.zhangoole@gmail.com>
src/osd/ReplicatedBackend.cc
src/osd/ReplicatedBackend.h

index 2bd645bfd104d0d00915c33b38232af8ef6e04e9..59beb92351a8a7aefcd86d4ea147e4a6156e9e63 100644 (file)
@@ -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);
index 922b99d8001a17b281c3523d7cc9d4de5715249e..ce127f2d874232270050d51c53d60e0798259b37 100644 (file)
@@ -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);