From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 24 Mar 2015 19:21:16 +0000 (-0400)
Subject: rbd: add support for new fast diff feature
X-Git-Tag: v9.0.1~55^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11cc7b2715c7ff13300c88f8b81568bde48b96af;p=ceph.git

rbd: add support for new fast diff feature

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

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index ccef6bdcdaf..f8987eb4ffb 100644
--- a/doc/man/8/rbd.rst
+++ b/doc/man/8/rbd.rst
@@ -135,6 +135,7 @@ Parameters
    striping: striping v2 support
    exclusive-lock: exclusive locking support
    object-map: object map support (requires exclusive-lock)
+   fast-diff: fast diff calculations (requires object-map)
 
 .. option:: --image-shared
 
diff --git a/src/rbd.cc b/src/rbd.cc
index 2713a76971f..d4f1eb0d287 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -81,7 +81,8 @@ static std::map<uint64_t, std::string> feature_mapping =
     RBD_FEATURE_LAYERING, "layering")(
     RBD_FEATURE_STRIPINGV2, "striping")(
     RBD_FEATURE_EXCLUSIVE_LOCK, "exclusive-lock")(
-    RBD_FEATURE_OBJECT_MAP, "object-map");
+    RBD_FEATURE_OBJECT_MAP, "object-map")(
+    RBD_FEATURE_FAST_DIFF, "fast-diff");
 
 void usage()
 {
diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 37506d30ef4..bd0d34a6f5f 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -100,7 +100,7 @@
     --allow-shrink                     allow shrinking of an image when resizing
   
   Supported image features:
-    layering (+), striping (+), exclusive-lock (*), object-map (*)
+    layering (+), striping (+), exclusive-lock (*), object-map (*), fast-diff (*)
   
     (*) supports enabling/disabling on existing images
     (+) enabled by default for new images if features are not specified