osd: use global id instead of entity_inst_t

Signed-off-by: Myoungwon Oh <omwmw@sk.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e2c4028f88cc7163d9c1a538dae72fe226b39902..a88ef6f846f3c8c941b734ddadba992ee891f49b 100644 (file)
--- 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 6abb40fe4435735ef80189e882c103b61076e3bf..32c84366a0529d5617f9d566279ea89f04f0bb82 100644 (file)
--- 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();
   }