librbd/migration/OpenSourceImageRequest: rename io_ctx -> dst_io_ctx

For now, this is just slightly clearer.  The distinction would become
important with planned support for migrating from external clusters.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit c14356b1f9eea0988e071f40dc0df005f70edd4d)

diff --git a/src/librbd/migration/OpenSourceImageRequest.cc b/src/librbd/migration/OpenSourceImageRequest.cc
index da2aa73eceaeb32e9a667374b1e64fa859395157..f3a9e7f174d7bb10cd8073968fbbb2174678542a 100644 (file)
--- a/src/librbd/migration/OpenSourceImageRequest.cc
+++ b/src/librbd/migration/OpenSourceImageRequest.cc
@@ -22,12 +22,12 @@ namespace migration {
 
 template <typename I>
 OpenSourceImageRequest<I>::OpenSourceImageRequest(
-    librados::IoCtx& io_ctx, I* dst_image_ctx, uint64_t src_snap_id,
+    librados::IoCtx& dst_io_ctx, I* dst_image_ctx, uint64_t src_snap_id,
     const MigrationInfo &migration_info, I** src_image_ctx, Context* on_finish)
-  : m_cct(reinterpret_cast<CephContext*>(io_ctx.cct())), m_io_ctx(io_ctx),
-    m_dst_image_ctx(dst_image_ctx), m_src_snap_id(src_snap_id),
-    m_migration_info(migration_info), m_src_image_ctx(src_image_ctx),
-    m_on_finish(on_finish) {
+  : m_cct(reinterpret_cast<CephContext*>(dst_io_ctx.cct())),
+    m_dst_io_ctx(dst_io_ctx), m_dst_image_ctx(dst_image_ctx),
+    m_src_snap_id(src_snap_id), m_migration_info(migration_info),
+    m_src_image_ctx(src_image_ctx), m_on_finish(on_finish) {
   ldout(m_cct, 10) << dendl;
 }
 
@@ -41,7 +41,7 @@ void OpenSourceImageRequest<I>::open_source() {
   ldout(m_cct, 10) << dendl;
 
   // note that all source image ctx properties are placeholders
-  *m_src_image_ctx = I::create("", "", CEPH_NOSNAP, m_io_ctx, true);
+  *m_src_image_ctx = I::create("", "", CEPH_NOSNAP, m_dst_io_ctx, true);
   auto src_image_ctx = *m_src_image_ctx;
   src_image_ctx->child = m_dst_image_ctx;
 

diff --git a/src/librbd/migration/OpenSourceImageRequest.h b/src/librbd/migration/OpenSourceImageRequest.h
index f0dab3ad99c095499e87838e9bbab610ffa92262..6ad5542eeca611126da18eaa92febe08ab1f2ec0 100644 (file)
--- a/src/librbd/migration/OpenSourceImageRequest.h
+++ b/src/librbd/migration/OpenSourceImageRequest.h
@@ -22,18 +22,18 @@ struct FormatInterface;
 template <typename ImageCtxT>
 class OpenSourceImageRequest {
 public:
-  static OpenSourceImageRequest* create(librados::IoCtx& io_ctx,
+  static OpenSourceImageRequest* create(librados::IoCtx& dst_io_ctx,
                                         ImageCtxT* destination_image_ctx,
                                         uint64_t src_snap_id,
                                         const MigrationInfo &migration_info,
                                         ImageCtxT** source_image_ctx,
                                         Context* on_finish) {
-    return new OpenSourceImageRequest(io_ctx, destination_image_ctx,
+    return new OpenSourceImageRequest(dst_io_ctx, destination_image_ctx,
                                       src_snap_id, migration_info,
                                       source_image_ctx, on_finish);
   }
 
-  OpenSourceImageRequest(librados::IoCtx& io_ctx,
+  OpenSourceImageRequest(librados::IoCtx& dst_io_ctx,
                          ImageCtxT* destination_image_ctx,
                          uint64_t src_snap_id,
                          const MigrationInfo &migration_info,
@@ -66,7 +66,7 @@ private:
   typedef std::map<uint64_t, SnapInfo> SnapInfos;
 
   CephContext* m_cct;
-  librados::IoCtx& m_io_ctx;
+  librados::IoCtx& m_dst_io_ctx;
   ImageCtxT* m_dst_image_ctx;
   uint64_t m_src_snap_id;
   MigrationInfo m_migration_info;