From 602203819a8ad0f553be6c57456b7bb55f634473 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 15 Sep 2017 23:53:57 -0400 Subject: [PATCH] osd: use PG::is_deleting() Signed-off-by: Sage Weil --- src/osd/OSD.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 5494ddccb6669..0e7cb882e63ed 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -9048,7 +9048,7 @@ void OSD::do_recovery( goto out; } - assert(!pg->deleting); + assert(!pg->is_deleting()); assert(pg->is_peered() && pg->is_primary()); assert(pg->recovery_queued); @@ -9216,7 +9216,7 @@ void OSD::dequeue_op( session->put(); } - if (pg->deleting) + if (pg->is_deleting()) return; op->mark_reached_pg(); @@ -9279,7 +9279,7 @@ void OSD::process_peering_events( PG *pg = *i; pg->lock_suspend_timeout(handle); curmap = service.get_osdmap(); - if (pg->deleting) { + if (pg->is_deleting()) { pg->unlock(); continue; } @@ -9805,7 +9805,7 @@ void OSD::ShardedOpWQ::clear_pg_pointer(spg_t pgid) if (p != sdata->pg_slots.end()) { auto& slot = p->second; dout(20) << __func__ << " " << pgid << " pg " << slot.pg << dendl; - assert(!slot.pg || slot.pg->deleting); + assert(!slot.pg || slot.pg->is_deleting()); slot.pg = nullptr; } } -- 2.39.5