librbd: remove get_snap_id_from_namespace

Signed-off-by: Victor Denisov <denisovenator@gmail.com>

diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index 5124f4a1eb211547efa6e3c5cf73599f91b95a80..2078e5a265f7496d2f512e5a66b4873c53dad38d 100644 (file)
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -468,19 +468,10 @@ struct C_InvalidateCache : public Context {
 
   snap_t ImageCtx::get_snap_id(cls::rbd::SnapshotNamespace in_snap_namespace,
                               string in_snap_name) const
-  {
-    assert(snap_lock.is_locked());
-    auto it = snap_ids.find({in_snap_namespace, in_snap_name});
-    if (it != snap_ids.end())
-      return it->second;
-    return CEPH_NOSNAP;
-  }
-
-  snap_t ImageCtx::get_snap_id_from_namespace(cls::rbd::SnapshotNamespace in_snap_namespace) const
   {
     assert(snap_lock.is_locked());
     map<pair<cls::rbd::SnapshotNamespace, std::string>, snap_t>::const_iterator it =
-      snap_ids.lower_bound({in_snap_namespace, ""});
+      snap_ids.lower_bound({in_snap_namespace, in_snap_name});
     if (it != snap_ids.end()) {
       return it->second;
     }

diff --git a/src/librbd/ImageCtx.h b/src/librbd/ImageCtx.h
index aee48bb981cc78b5b6dbed236be7eb188993f384..41635fd4cb5ee851fb43181d531dd024d4dbb5f5 100644 (file)
--- a/src/librbd/ImageCtx.h
+++ b/src/librbd/ImageCtx.h
@@ -243,8 +243,6 @@ namespace librbd {
     void snap_unset();
     librados::snap_t get_snap_id(cls::rbd::SnapshotNamespace in_snap_namespace,
                                 std::string in_snap_name) const;
-    librados::snap_t get_snap_id_from_namespace(
-      cls::rbd::SnapshotNamespace in_snap_namespace) const;
     const SnapInfo* get_snap_info(librados::snap_t in_snap_id) const;
     int get_snap_name(librados::snap_t in_snap_id,
                      std::string *out_snap_name) const;

diff --git a/src/librbd/api/Group.cc b/src/librbd/api/Group.cc
index bdd0205592ac21533835b2791cff85d83517e65f..acce62d7876b2e063c6f43e236d8ff390f5092b5 100644 (file)
--- a/src/librbd/api/Group.cc
+++ b/src/librbd/api/Group.cc
@@ -258,7 +258,7 @@ int group_snap_remove_by_record(librados::IoCtx& group_ioctx,
 
     std::string snap_name;
     ictx->snap_lock.get_read();
-    snap_t snap_id = ictx->get_snap_id_from_namespace(ne);
+    snap_t snap_id = ictx->get_snap_id(ne, "");
     r = ictx->get_snap_name(snap_id, &snap_name);
     ictx->snap_lock.put_read();
     if (r >= 0) {
@@ -853,7 +853,7 @@ int Group<I>::snap_create(librados::IoCtx& group_ioctx,
     } else {
       ImageCtx *ictx = ictxs[i];
       ictx->snap_lock.get_read();
-      snap_t snap_id = ictx->get_snap_id_from_namespace(ne);
+      snap_t snap_id = ictx->get_snap_id(ne, "");
       ictx->snap_lock.put_read();
       if (snap_id == CEPH_NOSNAP) {
        ldout(cct, 20) <<
@@ -892,7 +892,7 @@ remove_image_snaps:
     on_finishes[i] = new C_SaferCond;
     std::string snap_name;
     ictx->snap_lock.get_read();
-    snap_t snap_id = ictx->get_snap_id_from_namespace(ne);
+    snap_t snap_id = ictx->get_snap_id(ne, "");
     r = ictx->get_snap_name(snap_id, &snap_name);
     ictx->snap_lock.put_read();
     if (r >= 0) {