From 3d608c1857f912b7ffd899ecbc4dded7ce13c470 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Fri, 22 Sep 2017 16:10:01 +0900 Subject: [PATCH] osd: use global id instead of entity_inst_t Signed-off-by: Myoungwon Oh --- src/osd/PG.cc | 4 ++-- src/osd/PrimaryLogPG.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index e2c4028f88cc7..a88ef6f846f3c 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3463,7 +3463,7 @@ void PG::requeue_op(OpRequestRef op) op->get_req()->get_cost(), op->get_req()->get_priority(), op->get_req()->get_recv_stamp(), - op->get_req()->get_source_inst(), + op->get_req()->get_source().num(), get_osdmap()->get_epoch())); } } @@ -3497,7 +3497,7 @@ void PG::requeue_map_waiters() req->get_req()->get_cost(), req->get_req()->get_priority(), req->get_req()->get_recv_stamp(), - req->get_req()->get_source_inst(), + req->get_req()->get_source().num(), epoch)); } p = waiting_for_map.erase(p); diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 6abb40fe44357..32c84366a0529 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -9067,7 +9067,7 @@ void PrimaryLogPG::op_applied(const eversion_t &applied_version) op->get_req()->get_cost(), op->get_req()->get_priority(), op->get_req()->get_recv_stamp(), - op->get_req()->get_source_inst(), + op->get_req()->get_source().num(), get_osdmap()->get_epoch())); scrubber.active_rep_scrub = OpRequestRef(); } @@ -10310,7 +10310,7 @@ void PrimaryLogPG::_applied_recovered_object_replica() op->get_req()->get_cost(), op->get_req()->get_priority(), op->get_req()->get_recv_stamp(), - op->get_req()->get_source_inst(), + op->get_req()->get_source().num(), get_osdmap()->get_epoch())); scrubber.active_rep_scrub.reset(); } -- 2.39.5