From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Feb 2018 19:45:37 +0000 (-0600)
Subject: osd: pass sdata into dequeue_peering_evt (and dequeue_delete)
X-Git-Tag: v13.1.0~390^2~76
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a9c8d80cee06274302bf465ab697f50ae9fa9bd;p=ceph.git

osd: pass sdata into dequeue_peering_evt (and dequeue_delete)

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e2128ae319a6..8d37b5e1c5ab 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8982,6 +8982,7 @@ void OSD::dequeue_op(
 
 
 void OSD::dequeue_peering_evt(
+  OSDShard *sdata,
   PG *pg,
   PGPeeringEventRef evt,
   ThreadPool::TPHandle& handle)
@@ -9021,11 +9022,13 @@ void OSD::dequeue_peering_evt(
 }
 
 void OSD::dequeue_delete(
+  OSDShard *sdata,
   PG *pg,
   epoch_t e,
   ThreadPool::TPHandle& handle)
 {
   dequeue_peering_evt(
+    sdata,
     pg,
     PGPeeringEventRef(
       std::make_shared<PGPeeringEvent>(
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 7d9c7223c8b6..b1742dae1f72 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1769,11 +1769,13 @@ private:
     spg_t pgid,
     PGPeeringEventRef ref);
   void dequeue_peering_evt(
+    OSDShard *sdata,
     PG *pg,
     PGPeeringEventRef ref,
     ThreadPool::TPHandle& handle);
 
   void dequeue_delete(
+    OSDShard *sdata,
     PG *pg,
     epoch_t epoch,
     ThreadPool::TPHandle& handle);
diff --git a/src/osd/OpQueueItem.cc b/src/osd/OpQueueItem.cc
index deb73ee522d8..1deb1e7a03e0 100644
--- a/src/osd/OpQueueItem.cc
+++ b/src/osd/OpQueueItem.cc
@@ -31,7 +31,7 @@ void PGPeeringItem::run(
   PGRef& pg,
   ThreadPool::TPHandle &handle)
 {
-  osd->dequeue_peering_evt(pg.get(), evt, handle);
+  osd->dequeue_peering_evt(sdata, pg.get(), evt, handle);
 }
 
 void PGSnapTrim::run(
@@ -80,5 +80,5 @@ void PGDelete::run(
   PGRef& pg,
   ThreadPool::TPHandle &handle)
 {
-  osd->dequeue_delete(pg.get(), epoch_queued, handle);
+  osd->dequeue_delete(sdata, pg.get(), epoch_queued, handle);
 }