From: Kefu Chai <kchai@redhat.com>
Date: Thu, 12 Jul 2018 14:28:44 +0000 (+0800)
Subject: tools/rbd: assert(g_ceph_context) not g_conf
X-Git-Tag: v14.0.1~851^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23008%2Fhead;p=ceph.git

tools/rbd: assert(g_ceph_context) not g_conf

this addresses a warning introduced by f528475d:

src/tools/rbd/action/Create.cc:59:19: warning: the address of
'ConfigProxy& g_conf()' will never be NULL [-Waddress]
     assert(g_conf != nullptr);
            ~~~~~~~^~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/tools/rbd/action/Create.cc b/src/tools/rbd/action/Create.cc
index dd259f4ad405..1ca005e66489 100644
--- a/src/tools/rbd/action/Create.cc
+++ b/src/tools/rbd/action/Create.cc
@@ -56,7 +56,7 @@ struct thick_provision_writer {
   {
     // If error cases occur, the code is aborted, because
     // constructor cannot return error value.
-    assert(g_conf != nullptr);
+    assert(g_ceph_context != nullptr);
     bl.append_zero(block_size);
 
     librbd::image_info_t info;