librbd, librados: fix my last commits to use the new librados API

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

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index e15c05759ce40efee221d1072ef50b4ffa80e2a9..b95417863d4befcbf5c34e54ef6d48b081e6dc87 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -130,7 +130,7 @@ int rados_pool_selfmanaged_snap_set_write_ctx(rados_pool_t pool, rados_snap_t se
 int rados_pool_snap_list(rados_pool_t pool, rados_snap_t *snaps, int maxlen);
 int rados_pool_snap_lookup(rados_pool_t pool, const char *name, rados_snap_t *id);
 int rados_pool_snap_get_name(rados_pool_t pool, rados_snap_t id, char *name, int maxlen);
-int rados_pool_snap_get_stamp(PoolCtx *pool, uint64_t snapid, time_t *t);
+int rados_pool_snap_get_stamp(rados_pool_t pool, rados_snap_t id, time_t *t);
 
 /* sync io */
 uint64_t rados_get_last_version(rados_pool_t pool);

diff --git a/src/librados.cc b/src/librados.cc
index fec70ecd737d0c9c0a2e263cb3d342b365d7e9e6..7531e086803614bdd65f741c54cfb849f61e6dd8 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2826,7 +2826,7 @@ extern "C" int rados_pool_snap_get_name(rados_pool_t pool, rados_snap_t id,
 
 extern "C" int rados_pool_snap_get_stamp(rados_pool_t pool, rados_snap_t id, time_t *t)
 {
-  RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
+  PoolCtx *ctx = (PoolCtx *)pool;
   return ctx->client->snap_get_stamp(ctx, id, t);
 }
 

diff --git a/src/librbd.cc b/src/librbd.cc
index e88a153a9303309069c0cd7f75eb42ebb3c6fe24..e90b72611defaf1595e324c226fd20aa1f79c6db 100644 (file)
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -231,7 +231,7 @@ namespace librbd {
   int write_header(PoolHandle& pool, string& md_oid, bufferlist& header);
   int tmap_set(PoolHandle& pool, string& imgname);
   int tmap_rm(PoolHandle& pool, string& imgname);
-  int rollback_image(ImageCtx *ictx, uint64_t snapid);
+  int rollback_image(ImageCtx *ictx, const char *snap_name);
   void image_info(rbd_obj_header_ondisk& header, image_info_t& info, size_t info_size);
   string get_block_oid(rbd_obj_header_ondisk *header, uint64_t num);
   uint64_t get_max_block(rbd_obj_header_ondisk *header);
@@ -506,7 +506,7 @@ int rollback_image(ImageCtx *ictx, const char *snap_name)
   for (uint64_t i = 0; i < numseg; i++) {
     int r;
     string oid = get_block_oid(&(ictx->header), i);
-    r = ictx->pool.snap_rollback_object(ictx->pool, oid, snap_name);
+    r = ictx->pool.rollback(oid, snap_name);
     if (r < 0 && r != -ENOENT)
       return r;
   }