From 79dcef279407abbf54ced8f4e42dbcab51b98bf3 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Sun, 21 Feb 2016 17:02:02 +0200 Subject: [PATCH] librbd: add field to MirrorPeerClientMeta to store snap name Signed-off-by: Mykola Golub --- src/librbd/journal/Types.cc | 3 +++ src/librbd/journal/Types.h | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/librbd/journal/Types.cc b/src/librbd/journal/Types.cc index 781f793b933ba..f082e0268c87f 100644 --- a/src/librbd/journal/Types.cc +++ b/src/librbd/journal/Types.cc @@ -337,18 +337,21 @@ void MirrorPeerClientMeta::encode(bufferlist& bl) const { ::encode(cluster_id, bl); ::encode(pool_id, bl); ::encode(image_id, bl); + ::encode(snap_name, bl); } void MirrorPeerClientMeta::decode(__u8 version, bufferlist::iterator& it) { ::decode(cluster_id, it); ::decode(pool_id, it); ::decode(image_id, it); + ::decode(snap_name, it); } void MirrorPeerClientMeta::dump(Formatter *f) const { f->dump_string("cluster_id", cluster_id.c_str()); f->dump_int("pool_id", pool_id); f->dump_string("image_id", image_id.c_str()); + f->dump_string("snap_name", snap_name.c_str()); } void CliClientMeta::encode(bufferlist& bl) const { diff --git a/src/librbd/journal/Types.h b/src/librbd/journal/Types.h index cf4a6429686cf..5e3a5c0e16147 100644 --- a/src/librbd/journal/Types.h +++ b/src/librbd/journal/Types.h @@ -322,12 +322,15 @@ struct MirrorPeerClientMeta { std::string cluster_id; int64_t pool_id = 0; std::string image_id; + std::string snap_name; MirrorPeerClientMeta() { } MirrorPeerClientMeta(const std::string &cluster_id, int64_t pool_id, - const std::string &image_id) - : cluster_id(cluster_id), pool_id(pool_id), image_id(image_id) { + const std::string &image_id, + const std::string &snap_name = "") + : cluster_id(cluster_id), pool_id(pool_id), image_id(image_id), + snap_name(snap_name) { } void encode(bufferlist& bl) const; -- 2.39.5