From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Mon, 27 Feb 2017 16:36:19 +0000 (-0800)
Subject: Merge pull request #13547 from liewegas/wip-kill-copy-get-classic
X-Git-Tag: v12.0.1~253
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f15d025041ad2c60dfa3be6af306526c8e563a70;p=ceph-ci.git

Merge pull request #13547 from liewegas/wip-kill-copy-get-classic

osd: remove copy-get-classic

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

f15d025041ad2c60dfa3be6af306526c8e563a70
diff --cc src/osd/PrimaryLogPG.cc
index 579fe7c1cc9,cd759411688..2daf5d65598
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@@ -7061,12 -7039,9 +7035,12 @@@ int PrimaryLogPG::fill_in_copy_get
  }
  
  void PrimaryLogPG::fill_in_copy_get_noent(OpRequestRef& op, hobject_t oid,
-                                           OSDOp& osd_op, bool classic)
+                                           OSDOp& osd_op)
  {
 -  MOSDOp *m = static_cast<MOSDOp*>(op->get_req());
 +  // NOTE: we take non-const ref here for claim_op_out_data below; we must
 +  // be careful not to modify anything else that will upset a racing
 +  // operator<<
 +  MOSDOp *m = static_cast<MOSDOp*>(op->get_nonconst_req());
    uint64_t features = m->get_features();
    object_copy_data_t reply_obj;