Merge tag 'fix-missing-panels' into fixes

[sfrench/cifs-2.6.git] / Documentation / filesystems / ceph.txt

diff --git a/Documentation/filesystems/ceph.txt b/Documentation/filesystems/ceph.txt
index d2c6a5ccf0f5a9990fbfaca130c17c8eb85044c5..b19b6a03f91cefac1020fb77f6e4128593d25273 100644 (file)
--- a/Documentation/filesystems/ceph.txt
+++ b/Documentation/filesystems/ceph.txt
@@ -158,6 +158,20 @@ Mount Options
         copies.  Currently, it's only used in copy_file_range, which will revert
         to the default VFS implementation if this option is used.
 
+  recover_session=<no|clean>
+       Set auto reconnect mode in the case where the client is blacklisted. The
+       available modes are "no" and "clean". The default is "no".
+
+       * no: never attempt to reconnect when client detects that it has been
+       blacklisted. Operations will generally fail after being blacklisted.
+
+       * clean: client reconnects to the ceph cluster automatically when it
+       detects that it has been blacklisted. During reconnect, client drops
+       dirty data/metadata, invalidates page caches and writable file handles.
+       After reconnect, file locks become stale because the MDS loses track
+       of them. If an inode contains any stale file locks, read/write on the
+       inode is not allowed until applications release all stale file locks.
+
 More Information
 ================