librbd: handle CEPH_NOSNAP case outside of deep_copy::util::compute_snap_map

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

diff --git a/src/librbd/DeepCopyRequest.cc b/src/librbd/DeepCopyRequest.cc
index d4a20a717abbe7040ffb819f49aa88cb966200b6..56b177553f132173a0180378171c0664f05e8f9b 100644 (file)
--- a/src/librbd/DeepCopyRequest.cc
+++ b/src/librbd/DeepCopyRequest.cc
@@ -122,6 +122,10 @@ void DeepCopyRequest<I>::handle_copy_snapshots(int r) {
     return;
   }
 
+  if (m_snap_id_end == CEPH_NOSNAP) {
+    (*m_snap_seqs)[CEPH_NOSNAP] = CEPH_NOSNAP;
+  }
+
   send_copy_image();
 }
 

diff --git a/src/librbd/deep_copy/Utils.cc b/src/librbd/deep_copy/Utils.cc
index 85a4b5b985374dd5aafb395080b183b9bae00227..32b96587d194c202cc9c251abeff991606fbdeea 100644 (file)
--- a/src/librbd/deep_copy/Utils.cc
+++ b/src/librbd/deep_copy/Utils.cc
@@ -16,17 +16,12 @@ void compute_snap_map(librados::snap_t snap_id_start,
     snap_ids.insert(snap_ids.begin(), it.second);
     if (it.first < snap_id_start) {
       continue;
-    } else if (snap_id_end != CEPH_NOSNAP && it.first > snap_id_end) {
+    } else if (it.first > snap_id_end) {
       break;
     }
 
     (*snap_map)[it.first] = snap_ids;
   }
-
-  if (snap_id_end == CEPH_NOSNAP) {
-    snap_ids.insert(snap_ids.begin(), CEPH_NOSNAP);
-    (*snap_map)[CEPH_NOSNAP] = snap_ids;
-  }
 }
 
 } // util