]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13547 from liewegas/wip-kill-copy-get-classic
authorYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 27 Feb 2017 16:36:19 +0000 (08:36 -0800)
committerGitHub <noreply@github.com>
Mon, 27 Feb 2017 16:36:19 +0000 (08:36 -0800)
osd: remove copy-get-classic

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h
src/osd/osd_types.cc
src/osd/osd_types.h

diff --cc src/osd/OSD.cc
Simple merge
index 579fe7c1cc9771e1954f1dae2f40f6c39f600240,cd759411688a5f21db73e8fa058447a9284ec735..2daf5d655987b2775c7b9d6b8635894d4ccbe803
@@@ -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;
  
Simple merge
Simple merge
Simple merge