On 17.10.19 г. 7:50 ч., Merlin Büge wrote: > The removed paragraph in btrfs-man5.asciidoc says the same as the > previous one. This patch cannot be applied without an SOB line. Otherwise the changes look good. > --- > Documentation/btrfs-man5.asciidoc | 6 ------ > Documentation/mkfs.btrfs.asciidoc | 10 +++++----- > 2 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/Documentation/btrfs-man5.asciidoc b/Documentation/btrfs-man5.asciidoc > index 6a1a04b7..87ed5496 100644 > --- a/Documentation/btrfs-man5.asciidoc > +++ b/Documentation/btrfs-man5.asciidoc > @@ -224,12 +224,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*:: > 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 <profile>*:: > 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 <profile>*:: > 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 >
