From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Apr 2017 14:09:37 +0000 (-0400)
Subject: os/bluestore: narrow lock scope in _deferred_aio_finish
X-Git-Tag: v12.0.3~200^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65c2a88d0d0b0af99129e231ecae88ffcbc4f0b5;p=ceph.git

os/bluestore: narrow lock scope in _deferred_aio_finish

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 3b5701ef470a..89244dc6fb6c 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -8290,13 +8290,13 @@ void BlueStore::_deferred_aio_finish(OpSequencer *osr)
   DeferredBatch *b = osr->deferred_running;
   {
     std::lock_guard<std::mutex> l2(osr->qlock);
-    std::lock_guard<std::mutex> l(kv_lock);
     for (auto& i : b->txcs) {
       TransContext *txc = &i;
       txc->state = TransContext::STATE_DEFERRED_CLEANUP;
       txc->osr->qcond.notify_all();
       throttle_deferred_bytes.put(txc->cost);
     }
+    std::lock_guard<std::mutex> l(kv_lock);
     deferred_done_queue.emplace_back(b);
   }