From c9bf02f481174447c3fd1b6e35a1472e9b8e412d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 2 Apr 2018 08:33:37 -0500 Subject: [PATCH] osd: drop unused pushes_to_free variable on _process Signed-off-by: Sage Weil --- src/osd/OSD.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 3f80d03a170..0543215a4c9 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -9523,7 +9523,7 @@ void OSDShard::_prime_splits(set *pgids) dout(10) << "priming slot " << *p << dendl; r.first->second->waiting_for_split = true; } else { - auto q = pg_slots.find(*p); + auto q = r.first; assert(q != pg_slots.end()); if (q->second->waiting_for_split) { dout(10) << "slot " << *p << " already primed" << dendl; @@ -9718,7 +9718,6 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb) auto qi = std::move(slot->to_process.front()); slot->to_process.pop_front(); dout(20) << __func__ << " " << qi << " pg " << pg << dendl; - unsigned pushes_to_free = 0; set new_children; OSDMapRef osdmap; @@ -9809,9 +9808,6 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb) _add_slot_waiter(token, slot, std::move(qi)); sdata->sdata_op_ordering_lock.Unlock(); pg->unlock(); - if (pushes_to_free) { - osd->service.release_reserved_pushes(pushes_to_free); - } return; } } @@ -9823,9 +9819,6 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb) } assert(new_children.empty()); } - if (pushes_to_free) { - osd->service.release_reserved_pushes(pushes_to_free); - } // osd_opwq_process marks the point at which an operation has been dequeued // and will begin to be handled by a worker thread. -- 2.39.5