From: Jason Dillaman Date: Mon, 2 Apr 2018 15:17:04 +0000 (-0400) Subject: Merge pull request #21165 from Songweibin/wip-drop-redefine-func X-Git-Tag: v13.1.0~430 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5585e52c4721a66a3b9266e928b96757215c0277;p=ceph.git Merge pull request #21165 from Songweibin/wip-drop-redefine-func librbd: minor code cleanup Reviewed-by: Jason Dillaman --- 5585e52c4721a66a3b9266e928b96757215c0277 diff --cc src/include/rbd/librbd.h index f76a611986fc,a0ccb17374f3..51d83f9066d4 --- a/src/include/rbd/librbd.h +++ b/src/include/rbd/librbd.h @@@ -544,14 -543,10 +544,11 @@@ CEPH_RBD_API int rbd_snap_set_limit(rbd CEPH_RBD_API int rbd_snap_get_timestamp(rbd_image_t image, uint64_t snap_id, struct timespec *timestamp); CEPH_RBD_API int rbd_snap_set(rbd_image_t image, const char *snapname); +CEPH_RBD_API int rbd_snap_set_by_id(rbd_image_t image, uint64_t snap_id); CEPH_RBD_API int rbd_snap_get_namespace_type(rbd_image_t image, - uint64_t snap_id, - rbd_snap_namespace_type_t *namespace_type); - CEPH_RBD_API int rbd_snap_get_namespace_type(rbd_image_t image, - uint64_t snap_id, - rbd_snap_namespace_type_t *namespace_type); + uint64_t snap_id, + rbd_snap_namespace_type_t *namespace_type); CEPH_RBD_API int rbd_snap_get_group_namespace(rbd_image_t image, uint64_t snap_id, rbd_snap_group_namespace_t *group_snap,