Merge pull request #21165 from Songweibin/wip-drop-redefine-func

librbd: minor code cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/include/rbd/librbd.h
index f76a611986fc7709aa8a4cb76be84002f9e8bb14,a0ccb17374f31233324945df20b620fa1c5b7545..51d83f9066d42cf945e3c4ec464eff2ac3f155a4
--- 1/src/include/rbd/librbd.h
--- 2/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,

diff --cc src/librbd/api/Group.cc
Simple merge

diff --cc src/pybind/rbd/rbd.pyx
Simple merge