Merge pull request #18406 from adamemerson/wip-insecticide

test,osd,kvstore_tool: silence warnings and prepare test buffer in the right way

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/tools/ceph_kvstore_tool.cc
index 6d4288da54454fcbfb19c7f3df04ca65d298d5f3,2ba5d4aee2f44061cfe8a75f46445d91e88e7fd4..9319b487f5d2e3448cb40c04a72478d7b6ac22e7
--- 1/src/tools/ceph_kvstore_tool.cc
--- 2/src/tools/ceph_kvstore_tool.cc
+++ b/src/tools/ceph_kvstore_tool.cc
@@@ -36,12 -36,13 +36,13 @@@ using namespace std
  
  class StoreTool
  {
 -#ifdef HAVE_LIBAIO
 +#ifdef WITH_BLUESTORE
    struct Deleter {
      BlueStore *bluestore;
-     Deleter(BlueStore *store = nullptr)
-     : bluestore(store)
-     {}
+     Deleter()
+       : bluestore(nullptr) {}
+     Deleter(BlueStore *store)
+       : bluestore(store) {}
      void operator()(KeyValueDB *db) {
        if (bluestore) {
        bluestore->umount();