Skip to content

Commit c14356b

Browse files
committed
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 <[email protected]>
1 parent 789df2c commit c14356b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/librbd/migration/OpenSourceImageRequest.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ namespace migration {
2222

2323
template <typename I>
2424
OpenSourceImageRequest<I>::OpenSourceImageRequest(
25-
librados::IoCtx& io_ctx, I* dst_image_ctx, uint64_t src_snap_id,
25+
librados::IoCtx& dst_io_ctx, I* dst_image_ctx, uint64_t src_snap_id,
2626
const MigrationInfo &migration_info, I** src_image_ctx, Context* on_finish)
27-
: m_cct(reinterpret_cast<CephContext*>(io_ctx.cct())), m_io_ctx(io_ctx),
28-
m_dst_image_ctx(dst_image_ctx), m_src_snap_id(src_snap_id),
29-
m_migration_info(migration_info), m_src_image_ctx(src_image_ctx),
30-
m_on_finish(on_finish) {
27+
: m_cct(reinterpret_cast<CephContext*>(dst_io_ctx.cct())),
28+
m_dst_io_ctx(dst_io_ctx), m_dst_image_ctx(dst_image_ctx),
29+
m_src_snap_id(src_snap_id), m_migration_info(migration_info),
30+
m_src_image_ctx(src_image_ctx), m_on_finish(on_finish) {
3131
ldout(m_cct, 10) << dendl;
3232
}
3333

@@ -41,7 +41,7 @@ void OpenSourceImageRequest<I>::open_source() {
4141
ldout(m_cct, 10) << dendl;
4242

4343
// note that all source image ctx properties are placeholders
44-
*m_src_image_ctx = I::create("", "", CEPH_NOSNAP, m_io_ctx, true);
44+
*m_src_image_ctx = I::create("", "", CEPH_NOSNAP, m_dst_io_ctx, true);
4545
auto src_image_ctx = *m_src_image_ctx;
4646
src_image_ctx->child = m_dst_image_ctx;
4747

src/librbd/migration/OpenSourceImageRequest.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ struct FormatInterface;
2222
template <typename ImageCtxT>
2323
class OpenSourceImageRequest {
2424
public:
25-
static OpenSourceImageRequest* create(librados::IoCtx& io_ctx,
25+
static OpenSourceImageRequest* create(librados::IoCtx& dst_io_ctx,
2626
ImageCtxT* destination_image_ctx,
2727
uint64_t src_snap_id,
2828
const MigrationInfo &migration_info,
2929
ImageCtxT** source_image_ctx,
3030
Context* on_finish) {
31-
return new OpenSourceImageRequest(io_ctx, destination_image_ctx,
31+
return new OpenSourceImageRequest(dst_io_ctx, destination_image_ctx,
3232
src_snap_id, migration_info,
3333
source_image_ctx, on_finish);
3434
}
3535

36-
OpenSourceImageRequest(librados::IoCtx& io_ctx,
36+
OpenSourceImageRequest(librados::IoCtx& dst_io_ctx,
3737
ImageCtxT* destination_image_ctx,
3838
uint64_t src_snap_id,
3939
const MigrationInfo &migration_info,
@@ -66,7 +66,7 @@ class OpenSourceImageRequest {
6666
typedef std::map<uint64_t, SnapInfo> SnapInfos;
6767

6868
CephContext* m_cct;
69-
librados::IoCtx& m_io_ctx;
69+
librados::IoCtx& m_dst_io_ctx;
7070
ImageCtxT* m_dst_image_ctx;
7171
uint64_t m_src_snap_id;
7272
MigrationInfo m_migration_info;

0 commit comments

Comments
 (0)