From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 7 Jan 2016 00:18:56 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/jewel'
X-Git-Tag: v10.0.3~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f088a1bf8c9c96e68f29c9ec63f348fa8acd8bb;p=ceph.git

Merge remote-tracking branch 'origin/jewel'
---

3f088a1bf8c9c96e68f29c9ec63f348fa8acd8bb
diff --cc src/librbd/ImageCtx.cc
index ef15e2df602d,154c15a11442..3cbbdcf37f05
--- a/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);