librados, librbd: remove selfmanaged_snap_rollback_object

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index a1edb9f17b4bf8349b57c5d266852a2cd1c314b2..7e0008eadd5f25fc914fa01153359709c9b04bda 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -161,10 +161,6 @@ namespace librados
 
     int selfmanaged_snap_remove(uint64_t snapid);
 
-    // !!!REMOVE THIS!!!
-    int selfmanaged_snap_rollback(const std::string& oid, SnapContext& snapc,
-                                  uint64_t snapid);
-
     ObjectIterator objects_begin();
     const ObjectIterator& objects_end() const;
 

diff --git a/src/librados.cc b/src/librados.cc
index 6fa6f0f09c3e2ed3642fcb183fff73f84989bd47..fc1ce1f3c1a8f11f53eb128275e02ca30a82c8e6 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2177,21 +2177,6 @@ selfmanaged_snap_remove(uint64_t snapid)
   return pool_ctx->client->selfmanaged_snap_remove(pool_ctx, snapid);
 }
 
-int librados::PoolHandle::
-selfmanaged_snap_rollback(const std::string& oid, SnapContext& snapc,
-                          uint64_t snapid)
-{
-  ::SnapContext sn;
-  sn.seq = snapc.seq;
-  sn.snaps.clear();
-  std::vector<snap_t>::const_iterator iter = snapc.snaps.begin();
-  for (; iter != snapc.snaps.end(); ++iter) {
-    sn.snaps.push_back(*iter);
-  }
-  return pool_ctx->client->
-    selfmanaged_snap_rollback_object(pool_ctx, oid, sn, snapid);
-}
-
 librados::ObjectIterator librados::PoolHandle::
 objects_begin()
 {

diff --git a/src/librbd.cc b/src/librbd.cc
index e0fc043cb97e56e3a7b327b25e0ddc8c58e6daea..e88a153a9303309069c0cd7f75eb42ebb3c6fe24 100644 (file)
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -499,21 +499,14 @@ int tmap_rm(PoolHandle& pool, string& imgname)
   return pool.tmap_update(RBD_DIRECTORY, cmdbl);
 }
 
-int rollback_image(ImageCtx *ictx, uint64_t snapid)
+int rollback_image(ImageCtx *ictx, const char *snap_name)
 {
   uint64_t numseg = get_max_block(&(ictx->header));
 
   for (uint64_t i = 0; i < numseg; i++) {
     int r;
     string oid = get_block_oid(&(ictx->header), i);
-    librados::SnapContext sn;
-    sn.seq = ictx->snapc.seq;
-    sn.snaps.clear();
-    vector<snapid_t>::iterator iter = ictx->snapc.snaps.begin();
-    for (; iter != ictx->snapc.snaps.end(); ++iter) {
-      sn.snaps.push_back(*iter);
-    }
-    r = ictx->pool.selfmanaged_snap_rollback(oid, sn, snapid);
+    r = ictx->pool.snap_rollback_object(ictx->pool, oid, snap_name);
     if (r < 0 && r != -ENOENT)
       return r;
   }
@@ -892,7 +885,7 @@ int snap_rollback(ImageCtx *ictx, const char *snap_name)
     return r;
 
   ictx->pool.snap_set_read(ictx->snapid);
-  r = rollback_image(ictx, ictx->snapid);
+  r = rollback_image(ictx, snap_name);
   if (r < 0)
     return r;