summaryrefslogtreecommitdiff
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2016-03-01 19:13:56 +0300
committerChris Mason <clm@fb.com>2016-03-01 19:13:56 +0300
commitc05c5ee5ea40fe40df5e29471f583a0eb7c531e3 (patch)
treec56a3336bf631d9e97f038f1253e8e99726eb3e5 /Documentation/filesystems
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff)
parentf5bc27c71a1b0741cb93dbec0f216b012b21d93f (diff)
downloadlinux-c05c5ee5ea40fe40df5e29471f583a0eb7c531e3.tar.xz
Merge tag 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.6
Btrfs patchsets for 4.6
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r--Documentation/filesystems/btrfs.txt19
1 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index c772b47e7ef0..6593d2e415c5 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -168,10 +168,23 @@ Options with (*) are default options and will not show in the mount options.
notreelog
Enable/disable the tree logging used for fsync and O_SYNC writes.
- recovery
- Enable autorecovery attempts if a bad tree root is found at mount time.
- Currently this scans a list of several previous tree roots and tries to
+ nologreplay
+ Disable the log tree replay at mount time to prevent filesystem
+ from getting modified.
+ Must be used with 'ro' mount option.
+ A filesystem mounted with this option cannot transition to a
+ read-write mount via remount,rw - the filesystem must be unmounted
+ and mounted back again if read-write access is desired.
+
+ usebackuproot
+ Enable attempts to use backup tree roots if a bad tree root is found at
+ mount time.
+ Currently this scans a list of 4 previous tree roots and tries to
use the first readable.
+ And since the mount option doesn't affect any behavior after mount,
+ it won't be shown in mount info.
+ Prior to 4.6, this was done by 'recovery' option that has been
+ deprecated, but will work.
rescan_uuid_tree
Force check and rebuild procedure of the UUID tree. This should not