]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tools/rbd: assert(g_ceph_context) not g_conf 23167/head
authorKefu Chai <kchai@redhat.com>
Sun, 22 Jul 2018 05:01:45 +0000 (13:01 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 22 Jul 2018 05:01:54 +0000 (13:01 +0800)
see also 813cd5d5910c266c076d38277eddf32d908d5ae3

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/tools/rbd/action/Create.cc

index 1ca005e664896a664b54e44fc45043f2bbb4ae00..5a695d314adb29cd02051024c15444636dcb42e3 100644 (file)
@@ -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);