From: Kefu Chai <kchai@redhat.com>
Date: Sun, 22 Jul 2018 05:01:45 +0000 (+0800)
Subject: tools/rbd: assert(g_ceph_context) not g_conf
X-Git-Tag: v14.0.1~791^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6a934373103163b244737a8edc76b218af312583;p=ceph.git

tools/rbd: assert(g_ceph_context) not g_conf

see also 813cd5d5910c266c076d38277eddf32d908d5ae3

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 1ca005e664896..5a695d314adb2 100644
--- a/src/tools/rbd/action/Create.cc
+++ b/src/tools/rbd/action/Create.cc
@@ -180,7 +180,7 @@ int thick_write(const std::string &image_name,librados::IoCtx &io_ctx,
 
   // To prevent writesame from discarding data, thick_write sets
   // the rbd_discard_on_zeroed_write_same option to false.
-  assert(g_conf != nullptr);
+  assert(g_ceph_context != nullptr);
   r = g_conf().set_val("rbd_discard_on_zeroed_write_same", "false");
   assert(r == 0);
   r = utils::open_image(io_ctx, image_name, false, &image);