cls_rbd_client: use snapid_t type

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/librbd/cls_rbd_client.cc b/src/librbd/cls_rbd_client.cc
index 2d9eabdf13d04f34b7262b63761ff1221abdfaf6..e6d7c814d7bf018b3794fe9433fca114a27c919c 100644 (file)
--- a/src/librbd/cls_rbd_client.cc
+++ b/src/librbd/cls_rbd_client.cc
@@ -95,7 +95,7 @@ namespace librbd {
     }
 
     int get_features(librados::IoCtx *ioctx, const std::string &oid,
-                    uint64_t snap_id, uint64_t *features)
+                    snapid_t snap_id, uint64_t *features)
     {
       bufferlist inbl, outbl;
       ::encode(snap_id, inbl);
@@ -133,7 +133,7 @@ namespace librbd {
     }
 
     int get_size(librados::IoCtx *ioctx, const std::string &oid,
-                uint64_t snap_id, uint64_t *size, uint8_t *order)
+                snapid_t snap_id, uint64_t *size, uint8_t *order)
     {
       bufferlist inbl, outbl;
       ::encode(snap_id, inbl);
@@ -163,7 +163,7 @@ namespace librbd {
     }
 
     int snapshot_add(librados::IoCtx *ioctx, const std::string &oid,
-                    uint64_t snap_id, const std::string &snap_name)
+                    snapid_t snap_id, const std::string &snap_name)
     {
       bufferlist bl, bl2;
       ::encode(snap_name, bl);
@@ -173,7 +173,7 @@ namespace librbd {
     }
 
     int snapshot_remove(librados::IoCtx *ioctx, const std::string &oid,
-                       uint64_t snap_id)
+                       snapid_t snap_id)
     {
       bufferlist bl, bl2;
       ::encode(snap_id, bl);
@@ -219,7 +219,7 @@ namespace librbd {
       for (vector<snapid_t>::const_iterator it = ids.begin();
           it != ids.end(); ++it) {
        bufferlist bl1, bl2, bl3;
-       uint64_t snap_id = it->val;
+       snapid_t snap_id = it->val;
        ::encode(snap_id, bl1);
        op.exec("rbd", "get_snapshot_name", bl1);
        ::encode(snap_id, bl2);
@@ -270,7 +270,7 @@ namespace librbd {
     }
 
     int old_snapshot_add(librados::IoCtx *ioctx, const std::string &oid,
-                        uint64_t snap_id, const std::string &snap_name)
+                        snapid_t snap_id, const std::string &snap_name)
     {
       bufferlist bl, bl2;
       ::encode(snap_name, bl);

diff --git a/src/librbd/cls_rbd_client.h b/src/librbd/cls_rbd_client.h
index b4ab657920bbfb874b25efd04a661c1d82b82e6b..e801d6343738bffc689d31d1cdc6951fcba0162c 100644 (file)
--- a/src/librbd/cls_rbd_client.h
+++ b/src/librbd/cls_rbd_client.h
@@ -30,17 +30,17 @@ namespace librbd {
                     uint64_t size, uint8_t order, uint64_t features,
                     const std::string &object_prefix);
     int get_features(librados::IoCtx *ioctx, const std::string &oid,
-                    uint64_t snap_id, uint64_t *features);
+                    snapid_t snap_id, uint64_t *features);
     int get_object_prefix(librados::IoCtx *ioctx, const std::string &oid,
                          std::string *object_prefix);
     int get_size(librados::IoCtx *ioctx, const std::string &oid,
-                uint64_t snap_id, uint64_t *size, uint8_t *order);
+                snapid_t snap_id, uint64_t *size, uint8_t *order);
     int set_size(librados::IoCtx *ioctx, const std::string &oid,
                 uint64_t size);
     int snapshot_add(librados::IoCtx *ioctx, const std::string &oid,
-                    uint64_t snap_id, const std::string &snap_name);
+                    snapid_t snap_id, const std::string &snap_name);
     int snapshot_remove(librados::IoCtx *ioctx, const std::string &oid,
-                       uint64_t snap_id);
+                       snapid_t snap_id);
     int get_snapcontext(librados::IoCtx *ioctx, const std::string &oid,
                        ::SnapContext *snapc);
     int snapshot_list(librados::IoCtx *ioctx, const std::string &oid,
@@ -66,7 +66,7 @@ namespace librbd {
     // class operations on the old format, kept for
     // backwards compatability
     int old_snapshot_add(librados::IoCtx *ioctx, const std::string &oid,
-                        uint64_t snap_id, const std::string &snap_name);
+                        snapid_t snap_id, const std::string &snap_name);
     int old_snapshot_remove(librados::IoCtx *ioctx, const std::string &oid,
                            const std::string &snap_name);
     int old_snapshot_list(librados::IoCtx *ioctx, const std::string &oid,