]> xenbits.xensource.com Git - libvirt.git/commitdiff
rbd: rbd_diff_iterate2() is available in librbd since 266
authorWido den Hollander <wido@widodh.nl>
Thu, 11 Feb 2016 16:04:16 +0000 (17:04 +0100)
committerJohn Ferlan <jferlan@redhat.com>
Fri, 12 Feb 2016 20:51:37 +0000 (15:51 -0500)
In commit 0b15f920 there is a #ifdef which requires LIBRBD_VERSION_CODE
266 or newer for rbd_diff_iterate2()

rbd_diff_iterate2() is available since 266, so this if-statement should
require anything newer than 265.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
src/storage/storage_backend_rbd.c

index 5f2469f4f9a3856841ae9c13366a149675f208fd..887db0bfdd831a49f22e7ed5a4b8e74e2ed44ecd 100644 (file)
@@ -792,8 +792,10 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image,
  * rbd_diff_iterate2() is available in versions above Ceph 0.94 (Hammer)
  * It uses a object map inside Ceph which is faster than rbd_diff_iterate()
  * which iterates all objects.
+ * LIBRBD_VERSION_CODE for Ceph 0.94 is 265. In 266 and upwards diff_iterate2
+ * is available
  */
-#if LIBRBD_VERSION_CODE > 266
+#if LIBRBD_VERSION_CODE > 265
         r = rbd_diff_iterate2(image, snaps[i].name, 0, info.size, 0, 1,
                               virStorageBackendRBDIterateCb, (void *)&diff);
 #else