From 813cd5d5910c266c076d38277eddf32d908d5ae3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 12 Jul 2018 22:28:44 +0800 Subject: [PATCH] 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 --- src/tools/rbd/action/Create.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rbd/action/Create.cc b/src/tools/rbd/action/Create.cc index dd259f4ad405e..1ca005e664896 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; -- 2.39.5