Merge remote-tracking branch 'origin/jewel'

diff --cc src/librbd/ImageCtx.cc
index ef15e2df602dde81de16b50d9c93ba3c49c14c3e,154c15a1144255734a8168e90f452b334aad5db0..3cbbdcf37f05f6bdba5414b17fc7058514c87d00
--- 1/src/librbd/ImageCtx.cc
--- 2/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@@ -161,9 -161,10 +161,9 @@@ struct C_InvalidateCache : public Conte
        stripe_unit(0), stripe_count(0), flags(0),
        object_cacher(NULL), writeback_handler(NULL), object_set(NULL),
        readahead(),
-       total_bytes_read(0), copyup_finisher(NULL),
+       total_bytes_read(0),
        state(new ImageState<>(this)), exclusive_lock(nullptr),
 -      object_map(nullptr), aio_work_queue(NULL), op_work_queue(NULL),
 -      asok_hook(new LibrbdAdminSocketHook(this))
 +      object_map(nullptr), aio_work_queue(NULL), op_work_queue(NULL)
    {
      md_ctx.dup(p);
      data_ctx.dup(p);