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 ee05f6b1f8e84a31175e79de9bc2af48a5063aac..0c2381fc0ebc59d32d50f0dd988666d17c886eb0 100644 (file)
--- 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 6416ee36ab161acc412451f6b743d0e32a3d90f1..51522129212084c61f3bc1c5505a9f75d507983f 100755 (executable)
--- 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();
 }