From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Aug 2016 19:32:05 +0000 (-0400)
Subject: os/bluestore/BlueFS: init in header at decl
X-Git-Tag: ses5-milestone5~93^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0bbca748cd56e616f61672ba7c8e9d6ac973dbe0;p=ceph.git

os/bluestore/BlueFS: init in header at decl

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 189b9cd1af98..394a31d64d82 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -14,12 +14,7 @@
 #define dout_prefix *_dout << "bluefs "
 
 BlueFS::BlueFS()
-  : logger(NULL),
-    ino_last(0),
-    log_seq(0),
-    log_seq_stable(0),
-    log_writer(NULL),
-    bdev(MAX_BDEV),
+  : bdev(MAX_BDEV),
     ioc(MAX_BDEV),
     block_all(MAX_BDEV),
     block_total(MAX_BDEV, 0)
diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h
index a71a11b5c91d..0e45f9adf86a 100644
--- a/src/os/bluestore/BlueFS.h
+++ b/src/os/bluestore/BlueFS.h
@@ -191,20 +191,20 @@ public:
 private:
   std::mutex lock;
 
-  PerfCounters *logger;
+  PerfCounters *logger = nullptr;
 
   // cache
   map<string, DirRef> dir_map;                    ///< dirname -> Dir
   ceph::unordered_map<uint64_t,FileRef> file_map; ///< ino -> File
   dirty_file_list_t dirty_files;                  ///< list of dirty files
 
-  bluefs_super_t super;       ///< latest superblock (as last written)
-  uint64_t ino_last;          ///< last assigned ino (this one is in use)
-  uint64_t log_seq;           ///< last used log seq (by current pending log_t)
-  uint64_t log_seq_stable;    ///< last stable/synced log seq
-  FileWriter *log_writer;     ///< writer for the log
-  bluefs_transaction_t log_t; ///< pending, unwritten log transaction
-  bool log_flushing = false;  ///< true while flushing the log
+  bluefs_super_t super;        ///< latest superblock (as last written)
+  uint64_t ino_last = 0;       ///< last assigned ino (this one is in use)
+  uint64_t log_seq = 0;        ///< last used log seq (by current pending log_t)
+  uint64_t log_seq_stable = 0; ///< last stable/synced log seq
+  FileWriter *log_writer = 0;  ///< writer for the log
+  bluefs_transaction_t log_t;  ///< pending, unwritten log transaction
+  bool log_flushing = false;   ///< true while flushing the log
   std::condition_variable log_cond;
 
   /*