From 99d6346048601c8acfddd8fba5c5816e63ab87f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=BCge?= Date: Fri, 18 Oct 2019 18:14:33 +0200 Subject: [PATCH] btrfs-progs: small fixes/cleanup in Documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The removed paragraph in btrfs-man5.asciidoc says the same as the previous one. Signed-off-by: Merlin Büge Signed-off-by: David Sterba --- Documentation/btrfs-man5.asciidoc | 8 +------- Documentation/mkfs.btrfs.asciidoc | 10 +++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Documentation/btrfs-man5.asciidoc b/Documentation/btrfs-man5.asciidoc index 3b8a9672..11d8c7a4 100644 --- a/Documentation/btrfs-man5.asciidoc +++ b/Documentation/btrfs-man5.asciidoc @@ -231,12 +231,6 @@ during a period of low system activity will prevent latent interference with the performance of other operations. Also, a device may ignore the TRIM command if the range is too small, so running a batch discard has a greater probability of actually discarding the blocks. -+ -If discarding is not necessary to be done at the block freeing time, there's -`fstrim`(8) tool that lets the filesystem discard all free blocks in a batch, -possibly not much interfering with other operations. Also, the device may -ignore the TRIM command if the range is too small, so running the batch discard -can actually discard the blocks. *enospc_debug*:: *noenospc_debug*:: @@ -666,7 +660,7 @@ swapfile extents or may fail: * resize shrink - works as long as the extents are outside of the shrunk range * device add - a new device does not interfere with existing swapfile and this operation will work, though no new swapfile can be activated afterwards * device delete - if the device has been added as above, it can be also deleted -* device replace - dtto +* device replace - ditto When there are no active swapfiles and a whole-filesystem exclusive operation is running (ie. balance, device delete, shrink), the swapfiles cannot be diff --git a/Documentation/mkfs.btrfs.asciidoc b/Documentation/mkfs.btrfs.asciidoc index 2a1c3592..ef3eb13f 100644 --- a/Documentation/mkfs.btrfs.asciidoc +++ b/Documentation/mkfs.btrfs.asciidoc @@ -27,17 +27,17 @@ mkfs.btrfs uses the entire device space for the filesystem. *-d|--data *:: Specify the profile for the data block groups. Valid values are 'raid0', -'raid1', 'raid5', 'raid6', 'raid10' or 'single' or dup (case does not matter). +'raid1', 'raid5', 'raid6', 'raid10' or 'single' or 'dup' (case does not matter). + -See 'DUP PROFILES ON A SINGLE DEVICE' for more. +See 'DUP PROFILES ON A SINGLE DEVICE' for more details. *-m|--metadata *:: Specify the profile for the metadata block groups. Valid values are 'raid0', 'raid1', 'raid5', 'raid6', 'raid10', 'single' or -'dup', (case does not matter). +'dup' (case does not matter). + -A single device filesystem will default to 'DUP', unless a SSD is detected. Then -it will default to 'single'. The detection is based on the value of +A single device filesystem will default to 'DUP', unless an SSD is detected, in which +case it will default to 'single'. The detection is based on the value of `/sys/block/DEV/queue/rotational`, where 'DEV' is the short name of the device. + Note that the rotational status can be arbitrarily set by the underlying block