Merge pull request #17601 from liewegas/wip-21171-luminous

os/bluestore: fix deferred write deadlock, aio short return handling

diff --cc src/os/bluestore/BlueStore.cc
index 01a20792482b485568f54adcbd26d70c8b7f97ac,ce1fc3088ab5d8c1085d133d68756fdb55dcbac8..3f67090f5a34bbae10bb03839ce6d333bf211e35
--- 1/src/os/bluestore/BlueStore.cc
--- 2/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -8782,9 -8783,11 +8788,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