update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rocksdb / memory / arena.h

diff --git a/ceph/src/rocksdb/memory/arena.h b/ceph/src/rocksdb/memory/arena.h
index a7ee4c6ab01cff234a6b35c45acd0aced1b2677a..1de04c4770ed0440164bb9dafa334dd18ef19fc8 100644 (file)
--- a/ceph/src/rocksdb/memory/arena.h
+++ b/ceph/src/rocksdb/memory/arena.h
@@ -78,7 +78,7 @@ class Arena : public Allocator {
   size_t BlockSize() const override { return kBlockSize; }
 
   bool IsInInlineBlock() const {
-    return blocks_.empty();
+    return blocks_.empty() && huge_blocks_.empty();
   }
 
  private:
@@ -86,7 +86,7 @@ class Arena : public Allocator {
   // Number of bytes allocated in one block
   const size_t kBlockSize;
   // Array of new[] allocated memory blocks
-  typedef std::vector<char*> Blocks;
+  using Blocks = std::vector<char*>;
   Blocks blocks_;
 
   struct MmapInfo {