From: Adam C. Emerson <aemerson@redhat.com>
Date: Wed, 7 Dec 2016 23:32:54 +0000 (-0500)
Subject: os: Continuing the removal of g_ceph_context and g_conf
X-Git-Tag: v12.0.0~384^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec815bb93404a6234344b75491923fa885bdc8ce;p=ceph.git

os: Continuing the removal of g_ceph_context and g_conf

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc
index ee05f6b1f8e..0c2381fc0eb 100644
--- a/src/os/ObjectStore.cc
+++ b/src/os/ObjectStore.cc
@@ -64,7 +64,7 @@ ObjectStore *ObjectStore::create(CephContext *cct,
 				 const string& type,
 				 const string& data,
 				 const string& journal,
-			         osflagbits_t flags)
+				 osflagbits_t flags)
 {
   if (type == "filestore") {
     return new FileStore(cct, data, journal, flags);
diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index 6416ee36ab1..51522129212 100755
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -638,7 +638,7 @@ KStore::KStore(CephContext *cct, const string& path)
     finisher(cct),
     kv_sync_thread(this),
     kv_stop(false),
-    logger(NULL)
+    logger(nullptr)
 {
   _init_logger();
 }