From: Mykola Golub <mgolub@mirantis.com>
Date: Sun, 21 Feb 2016 15:02:02 +0000 (+0200)
Subject: librbd: add field to MirrorPeerClientMeta to store snap name
X-Git-Tag: v10.1.0~314^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79dcef279407abbf54ced8f4e42dbcab51b98bf3;p=ceph.git

librbd: add field to MirrorPeerClientMeta to store snap name

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/librbd/journal/Types.cc b/src/librbd/journal/Types.cc
index 781f793b933b..f082e0268c87 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 cf4a6429686c..5e3a5c0e1614 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;