Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / Documentation / ABI / testing / sysfs-bus-rbd

diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd
index 273e27f..f208ac5 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/Documentation/ABI/testing/sysfs-bus-rbd
@@ -6,7 +6,7 @@ Description:
 
 Being used for adding and removing rbd block devices.
 
-Usage: <mon ip addr> <options> <pool name> <rbd image name> [snap name]
+Usage: <mon ip addr> <options> <pool name> <rbd image name> [<snap name>]
 
  $ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add
 
@@ -14,9 +14,13 @@ The snapshot name can be "-" or omitted to map the image read/write. A <dev-id>
 will be assigned for any registered block device. If snapshot is used, it will
 be mapped read-only.
 
-Removal of a device:
+Usage: <dev-id> [force]
 
-  $ echo <dev-id> > /sys/bus/rbd/remove
+ $ echo 2 > /sys/bus/rbd/remove
+
+Optional "force" argument which when passed will wait for running requests and
+then unmap the image. Requests sent to the driver after initiating the removal
+will be failed.  (August 2016, since 4.9.)
 
 What:          /sys/bus/rbd/add_single_major
 Date:          December 2013
@@ -53,6 +57,15 @@ client_id
 
        The ceph unique client id that was assigned for this specific session.
 
+cluster_fsid
+
+       The ceph cluster UUID.  (August 2016, since 4.9.)
+
+config_info
+
+       The string written into /sys/bus/rbd/add{,_single_major}.  (August
+       2016, since 4.9.)
+
 features
 
        A hexadecimal encoding of the feature bits for this image.
@@ -98,6 +111,10 @@ current_snap
 
        The current snapshot for which the device is mapped.
 
+snap_id
+
+       The current snapshot's id.  (August 2016, since 4.9.)
+
 parent
 
        Information identifying the chain of parent images in a layered rbd