Merge pull request #17352 from liewegas/wip-21171

os/bluestore: drop deferred_submit_lock, fix aio leak

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Pan Liu <liupan1111@gmail.com>

diff --cc src/os/bluestore/BlueStore.cc
index 997f261ab6592a813db515bc4cca207eb885896f,5cfd8a05914c433842e97ba3873cf4f00e7c45d0..868c0f6a4db9e79e04a27610b9d2ff5217bbdc81
--- 1/src/os/bluestore/BlueStore.cc
--- 2/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -8726,9 -8724,11 +8732,11 @@@ void BlueStore::_deferred_aio_finish(Op
        deferred_queue.erase(q);
      } else if (deferred_aggressive) {
        dout(20) << __func__ << " queuing async deferred_try_submit" << dendl;
 -      finishers[0]->queue(new FunctionContext([&](int) {
 +      deferred_finisher.queue(new FunctionContext([&](int) {
            deferred_try_submit();
          }));
+     } else {
+       dout(20) << __func__ << " leaving queued, more pending" << dendl;
      }
    }
  

diff --cc src/os/bluestore/BlueStore.h
Simple merge