OSD: do not lock osd during dequeue_op

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b509b6e6d85a930fe081b60127891e91f180f854..4d465b35a30fd6632a5a0bd8ba21c7ca60622c07 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5397,24 +5397,12 @@ void OSD::dequeue_op(PG *pg)
 {
   OpRequestRef op;
 
-  osd_lock.Lock();
-  {
-    // lock pg and get pending op
-    pg->lock();
-
-    assert(!pg->op_queue.empty());
-    op = pg->op_queue.front();
-    pg->op_queue.pop_front();
+  pg->lock();
+  assert(!pg->op_queue.empty());
+  op = pg->op_queue.front();
+  pg->op_queue.pop_front();
     
-    dout(10) << "dequeue_op " << *op->request << " pg " << *pg << dendl;
-
-    // share map?
-    //  do this preemptively while we hold osd_lock and pg->lock
-    //  to avoid lock ordering issues later.
-    for (unsigned i=1; i<pg->acting.size(); i++) 
-      _share_map_outgoing( osdmap->get_cluster_inst(pg->acting[i]) );
-  }
-  osd_lock.Unlock();
+  dout(10) << "dequeue_op " << *op->request << " pg " << *pg << dendl;
 
   op->mark_reached_pg();