doc: clarify support for rbd fancy striping

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index cba9f994d85f2788629ce94bce71a28c3286022e..45433775cf448db80ebd5fbd4eddcca714816c79 100644 (file)
--- a/doc/man/8/rbd.rst
+++ b/doc/man/8/rbd.rst
@@ -64,8 +64,9 @@ Parameters
      format is understood by all versions of librbd and the kernel rbd module,
      but does not support newer features like cloning.
 
-   * format 2 - Use the second rbd format, which is supported by
-     librbd and kernel since version 3.11 (except for striping). This adds
+   * format 2 - Use the second rbd format, which is supported by librbd since
+     the Bobtail release and the kernel rbd module since kernel 3.10 (except
+     for "fancy" striping, which is supported since kernel 4.17). This adds
      support for cloning and is more easily extensible to allow more
      features in the future.
 
@@ -684,8 +685,7 @@ The striping is controlled by three parameters:
   we move on to the next [*stripe_count*] objects.
 
 By default, [*stripe_unit*] is the same as the object size and [*stripe_count*] is 1.  Specifying a different
-[*stripe_unit*] requires that the STRIPINGV2 feature be supported (added in Ceph v0.53) and format 2 images be
-used.
+[*stripe_unit*] and/or [*stripe_count*] is often referred to as using "fancy" striping and requires format 2.
 
 
 Kernel rbd (krbd) options

diff --git a/doc/rbd/rbd-config-ref.rst b/doc/rbd/rbd-config-ref.rst
index fcccbaa4988750ed6e4cb44d7674ab833e103600..40e318e1512210d127d7834898f01bb42fcd07b0 100644 (file)
--- a/doc/rbd/rbd-config-ref.rst
+++ b/doc/rbd/rbd-config-ref.rst
@@ -160,7 +160,7 @@ RBD supports advanced features which can be specified via the command line when
 :Description: Layering enables you to use cloning.
 :Internal value: 1
 :CLI value: layering
-:Added in: v0.70 (Emperor)
+:Added in: v0.52 (Bobtail)
 :KRBD support: since v3.10
 :Default: yes
 
@@ -169,8 +169,8 @@ RBD supports advanced features which can be specified via the command line when
 :Description: Striping spreads data across multiple objects. Striping helps with parallelism for sequential read/write workloads.
 :Internal value: 2
 :CLI value: striping
-:Added in: v0.70 (Emperor)
-:KRBD support: since v3.10
+:Added in: v0.55 (Bobtail)
+:KRBD support: since v3.10 (default striping only, "fancy" striping added in v4.17)
 :Default: yes
 
 ``Exclusive locking``