From: Jos Collin <jcollin@redhat.com>
Date: Sun, 25 Aug 2019 03:04:59 +0000 (+0530)
Subject: os/bluestore: silence StupidAllocator reorder warning
X-Git-Tag: v15.1.0~1767^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29866%2Fhead;p=ceph.git

os/bluestore: silence StupidAllocator reorder warning

warning: ‘StupidAllocator::last_alloc’ will be initialized after [-Wreorder]

Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/os/bluestore/StupidAllocator.cc b/src/os/bluestore/StupidAllocator.cc
index f75f74468a9f..2660657d9e93 100644
--- a/src/os/bluestore/StupidAllocator.cc
+++ b/src/os/bluestore/StupidAllocator.cc
@@ -14,9 +14,8 @@ StupidAllocator::StupidAllocator(CephContext* cct,
                                  const std::string& name,
                                  int64_t _block_size)
   : Allocator(name), cct(cct), num_free(0),
-    free(10),
-    last_alloc(0),
-    block_size(_block_size)
+    block_size(_block_size),
+    free(10)
 {
 }
 
diff --git a/src/os/bluestore/StupidAllocator.h b/src/os/bluestore/StupidAllocator.h
index d9c4a4478b63..3922a2e4d828 100644
--- a/src/os/bluestore/StupidAllocator.h
+++ b/src/os/bluestore/StupidAllocator.h
@@ -26,7 +26,7 @@ class StupidAllocator : public Allocator {
   typedef interval_set<uint64_t,interval_set_map_t> interval_set_t;
   std::vector<interval_set_t> free;  ///< leading-edge copy
 
-  uint64_t last_alloc;
+  uint64_t last_alloc = 0;
 
   unsigned _choose_bin(uint64_t len);
   void _insert_free(uint64_t offset, uint64_t len);