Skip to content

Commit 4f7bf10

Browse files
committed
btrfs-progs: docs: typo fixups and formatting updates
Signed-off-by: David Sterba <[email protected]>
1 parent b80c1d0 commit 4f7bf10

20 files changed

+66
-68
lines changed

Documentation/Deduplication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ a source file, destination file and the range. The blocks from both files are
6464
compared for exact match before merging to the same range (i.e. there's no
6565
hash based comparison). Pages representing the extents in memory are locked
6666
prior to deduplication and prevent concurrent modification by buffered writes
67-
or mmaped writes. Blocks are compared byte by byte and not using any hash-based
67+
or mmapped writes. Blocks are compared byte by byte and not using any hash-based
6868
approach, i.e. the existing checksums are not used.
6969

7070
Limitations, compatibility

Documentation/Experimental.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ for larger code blocks.
3636

3737
Each feature should be tracked in an issue with label **experimental** (list of
3838
active issues https://github.com/kdave/btrfs-progs/labels/experimental), with a
39-
description and a todo list items. Individual tasks can be tracked in other
39+
description and a TODO list items. Individual tasks can be tracked in other
4040
issues if needed.

Documentation/Feature-by-version.rst

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ features see [[Status]] page.
1919
Automatic repair of broken data from a good copy
2020

2121
3.2 - root backups
22-
Save a few previous versions of the most imporant tree roots at commit time, used by *-o recovery*
22+
Save a few previous versions of the most important tree roots at commit time, used by *-o recovery*
2323

2424
3.3 - integrity checker
2525
Optional infrastructure to verify integrity of written metadata blocks
@@ -57,14 +57,14 @@ features see [[Status]] page.
5757
.. note::
5858
Default since btrfs-progs 3.12
5959

60-
3.7 - hole puching
60+
3.7 - hole punching
6161
Implement the FALLOC_FL_PUNCH_HOLE mode of *fallocate*
6262

6363
3.8 - device replace
6464
Efficient replacement of existing device (add/remove in one go)
6565

6666
3.9 - raid 5/6 *(incomplete)*
67-
Basic support for RAD5/6 profiles, no crash resiliency, replace and scrub support
67+
Basic support for RAID5/6 profiles, no crash resiliency, replace and scrub support
6868

6969
3.9 - snapshot-aware defrag
7070
Defrag does not break links between shared extents (snapshots, reflinked files)
@@ -88,10 +88,10 @@ features see [[Status]] page.
8888
3.10 - qgroup rescan
8989
Sync qgroups with existing filesystem data
9090

91-
3.12 - uuid tree
91+
3.12 - UUID tree
9292
A map of subvolume/UUID that vastly speeds up send/receive
9393

94-
3.12 - out-of-bound dedup
94+
3.12 - out-of-bound deduplication
9595
Support for deduplicating extents on a given set of files.
9696

9797
3.14 - no-holes
@@ -106,10 +106,10 @@ features see [[Status]] page.
106106
3.16 - search ioctl v2
107107
The extended SEARCH_TREE ioctl able to get more than a 4k data
108108

109-
3.18 - auto blockgroup reclaim
110-
Automatically remove blockgroups (aka. chunks) that become completely empty.
109+
3.18 - auto block group reclaim
110+
Automatically remove block groups (aka. chunks) that become completely empty.
111111

112-
3.19 - raid56: scrub, replace
112+
3.19 - RAID56: scrub, replace
113113
Scrub and device replace works on RAID56 filesystems.
114114

115115
4.x
@@ -145,7 +145,7 @@ features see [[Status]] page.
145145
big-endian machines, x86* is ok
146146

147147
4.5 - balance filter updates
148-
Conversion to data/DUP profile possible through balance filters -- on single-device filesytem.
148+
Conversion to data/DUP profile possible through balance filters -- on single-device filesystem.
149149

150150
.. note::
151151
mkfs.btrfs allows creating DUP on single device in the non-mixed mode since 4.4
@@ -172,7 +172,7 @@ features see [[Status]] page.
172172
.. note::
173173
mkfs.btrfs allows creating DUP on multiple devices since 4.5.1
174174

175-
4.12 - raid56: auto repair
175+
4.12 - RAID56: auto repair
176176
Scrub will attempt auto-repair (similar to raid1/raid10)
177177

178178
4.13 - statx
@@ -189,7 +189,7 @@ features see [[Status]] page.
189189

190190
4.14 - improved degraded mount
191191
Allow degraded mount based on the chunk constraints, not device number
192-
constraints. Eg. when one device is missing but the remaining one holds
192+
constraints. E.g. when one device is missing but the remaining one holds
193193
all *single* chunks.
194194

195195
4.14 - *deprecated user transaction ioctl*
@@ -211,14 +211,14 @@ features see [[Status]] page.
211211
Debugging functionality to verify extent references. New mount option
212212
<i>ref-verify</i>, must be built with CONFIG_BTRFS_FS_REF_VERIFY.
213213

214-
4.15 - zlib level
215-
Allow to set the zlib compression level via mount option, e.g. like
216-
*compress=zlib:9*. The levels match the default zlib compression
214+
4.15 - ZLIB level
215+
Allow to set the ZLIB compression level via mount option, e.g. like
216+
*compress=zlib:9*. The levels match the default ZLIB compression
217217
levels. The default is 3.
218218

219219
4.15 - v2 of LOGICAL_INO ioctl
220220
An enhanced version of ioctl that can translate logical extent offset
221-
to inode numbers, "who owns this block". For certain usecases the V1
221+
to inode numbers, "who owns this block". For certain use cases the V1
222222
performs bad and this is addressed by V2.
223223
[https://git.kernel.org/linus/d24a67b2d997c860a42516076f3315c2ad2d2884
224224
Read more.]
@@ -267,7 +267,7 @@ features see [[Status]] page.
267267
INO_LOOKUP ioctl.
268268

269269
4.19 - defrag ro/rw
270-
Allow to run defrag on files that are normally accesible for
270+
Allow to run defrag on files that are normally accessible for
271271
read-write, but are currently opened in read-only mode.
272272

273273
5.x
@@ -288,9 +288,9 @@ features see [[Status]] page.
288288
Unregister devices previously added by the scan ioctl, same effect as
289289
if the kernel module is reloaded.
290290

291-
5.1 - zstd level
292-
Allow to set the zstd compression level via mount option, e.g. like
293-
*compress=zstd:9*. The levels match the default zstd compression
291+
5.1 - ZSTD level
292+
Allow to set the ZSTD compression level via mount option, e.g. like
293+
*compress=zstd:9*. The levels match the default ZSTD compression
294294
levels. The default is 3, maximum is 15.
295295

296296
5.2 - pre-write checks
@@ -315,7 +315,7 @@ features see [[Status]] page.
315315

316316
5.7 - faster balance cancel
317317
More cancellation points in balance that will shorten the time to stop
318-
processing once <tt>btrfs balance cancel</tt> is called.
318+
processing once ``btrfs balance cancel`` is called.
319319

320320
5.7 - *removed flag BTRFS_SUBVOL_CREATE_ASYNC*
321321
Remove support of flag BTRFS_SUBVOL_CREATE_ASYNC from subvolume creation ioctl.
@@ -335,7 +335,7 @@ features see [[Status]] page.
335335

336336
5.10 - exclusive ops in sysfs
337337
Export which filesystem exclusive operation is running (balance,
338-
resize, device add/delete/relpace, ...)
338+
resize, device add/delete/replace, ...)
339339

340340
5.11 - remove *inode_cache*
341341
Remove inode number caching feature (mount -o inode_cache)
@@ -375,7 +375,7 @@ features see [[Status]] page.
375375
files. https://www.kernel.org/doc/html/latest/filesystems/fsverity.html
376376

377377
5.15 - idmapped mount
378-
Support mount with uid/gid mapped according to another namespace.
378+
Support mount with UID/GID mapped according to another namespace.
379379
https://lwn.net/Articles/837566/
380380

381381
5.16 - ZNS in zoned
@@ -393,7 +393,7 @@ features see [[Status]] page.
393393
Since kernel 5.17.7 and btrfs-progs 5.17.1
394394

395395
5.17 - *no warning with flushoncommit*
396-
Mounting with *-o flushoncommit* does not triggher the (harmless)
396+
Mounting with *-o flushoncommit* does not trigger the (harmless)
397397
warning at each transaction commit
398398

399399
.. note::
@@ -439,7 +439,7 @@ features see [[Status]] page.
439439
types (data, metadata, system).
440440

441441
5.19 - automatically repair device number mismatch
442-
Device information is storead in two places, the number in the super
442+
Device information is stored in two places, the number in the super
443443
block and items in the device tree. When this is goes out of sync, e.g.
444444
by device removal short before unmount, the next mount could fail.
445445
The b-tree is an authoritative information an can be used to override
@@ -470,7 +470,7 @@ features see [[Status]] page.
470470
6.0 - send protocol v2
471471
Send protocol update that adds new commands and extends existing
472472
functionality to write large data chunks. Compressed (and encrypted)
473-
extents can be optionally emitted and transfered as-is without the need
473+
extents can be optionally emitted and transferred as-is without the need
474474
to recompress (or reencrypt) on the receiving side.
475475

476476
6.0 - sysfs exports commit stats
@@ -506,7 +506,7 @@ features see [[Status]] page.
506506
An incompatible change that has to be enabled at mkfs time. Add a new
507507
b-tree item that stores information about block groups in a compact way
508508
that significantly improves mount time that's usually long due to
509-
fragmentation and scatterd b-tree items tracking the individual block
509+
fragmentation and scattered b-tree items tracking the individual block
510510
groups. Requires and also enables the free-space-tree and no-holes
511511
features.
512512

@@ -518,7 +518,7 @@ features see [[Status]] page.
518518
The overall status of qgroups are exported in
519519
/sys/sys/fs/btrfs/FSID/qgroups/ .
520520

521-
6.1 - check that subperblock is unchnaged at thaw time
521+
6.1 - check that subperblock is unchanged at thaw time
522522
Do full check of super block once a filesystem is thawed. This namely
523523
happens when system resumes from suspend or hibernation. Accidental
524524
change by other operating systems will be detected.

Documentation/Glossary.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ copy-on-write
8383
way. In COW filesystems, files tend to fragment as they are modified.
8484
Copy-on-write is also used in the implementation of *snapshots* and
8585
*reflink copies*. A copy-on-write filesystem is, in theory,
86-
'always' consistent, provided the underlying hardware supports
86+
*always* consistent, provided the underlying hardware supports
8787
*barriers*.
8888

8989
COW
@@ -142,8 +142,8 @@ fallocate
142142
Command line tool in util-linux, and a syscall, that reserves space in
143143
the filesystem for a file, without actually writing any file data to
144144
the filesystem. First data write will turn the preallocated extents
145-
into regular ones. See <code>man 1 fallocate</code> and <code>man 2
146-
fallocate</code> for more details.
145+
into regular ones. See *fallocate(1)* and *fallocate(2)* manual pages
146+
for more details.
147147

148148
filefrag
149149
A tool to show the number of extents in a file, and hence the amount of
@@ -160,7 +160,7 @@ free space cache
160160

161161
fsync
162162
On Unix and Unix-like operating systems (of which Linux is the latter),
163-
the ``lfsync()`` system call causes all buffered file
163+
the ``fsync()`` system call causes all buffered file
164164
descriptor related data changes to be flushed to the underlying block
165165
device. When a file is modified on a modern operating system the
166166
changes are generally not written to the disk immediately but rather
@@ -292,9 +292,8 @@ subvolume
292292
a reference on the root of another subvolume. Each btrfs filesystem has
293293
at least one subvolume, the *top-level subvolume*, which contains
294294
everything else in the filesystem. Additional subvolumes can be created
295-
and deleted with the *<code>btrfs</code>* tool. All subvolumes share
296-
the same pool of free space in the filesystem. See also *default
297-
subvolume*.
295+
and deleted with the *btrfs<* tool. All subvolumes share the same pool
296+
of free space in the filesystem. See also *default subvolume*.
298297

299298
superblock
300299
The *block* on the disk, at a fixed known location and of fixed size,

Documentation/Source-repositories.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ patches to the mailing list instead. You can link to a branch in any git
7272
repository if the mails do not make it to the mailing list or for convenience.
7373

7474
The development model of btrfs-progs shares a lot with the kernel model. The
75-
github way is different in some ways. We, the upstream community, expect that
76-
the patches meet some criteria (often lacking in github contributions):
75+
github.com way is different in some ways. We, the upstream community, expect that
76+
the patches meet some criteria (often lacking in github.com contributions):
7777

78-
* proper **subject line**: eg. prefix with *btrfs-progs: subpart, ...* ,
78+
* proper **subject line**: e.g. prefix with *btrfs-progs: subpart, ...* ,
7979
descriptive yet not too long
8080
* proper **changelog**: the changelogs are often missing or lacking
8181
explanation *why* the change was made, or *how* is something broken,
@@ -84,7 +84,7 @@ the patches meet some criteria (often lacking in github contributions):
8484
* the **Signed-off-by** line: this document who authored the change, you can
8585
read more about the *The Developer's Certificate of Origin*
8686
`here (chapter 11) <https://www.kernel.org/doc/Documentation/SubmittingPatches>`_]
87-
* **one logical change** per patch: eg. not mixing bugfixes, cleanups,
87+
* **one logical change** per patch: e.g. not mixing bug fixes, cleanups,
8888
features etc., sometimes it's not clear and will be usually pointed out
8989
during reviews
9090

Documentation/btrfs-check.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ by the option *--readonly*.
2222
.. warning::
2323
Do not use *--repair* unless you are advised to do so by a developer
2424
or an experienced user, and then only after having accepted that no *fsck*
25-
successfully repair all types of filesystem corruption. Eg. some other software
25+
successfully repair all types of filesystem corruption. E.g. some other software
2626
or hardware bugs can fatally damage a volume.
2727

2828
The structural integrity check verifies if internal filesystem objects or

Documentation/btrfs-man5.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tools. Currently covers:
1919
#. control device
2020
#. filesystems with multiple block group profiles
2121
#. seeding device
22-
#. raid56 status and recommended practices
22+
#. RAID56 status and recommended practices
2323
#. storage model, hardware considerations
2424

2525

@@ -129,10 +129,10 @@ raid1c34
129129

130130
extended RAID1 mode with copies on 3 or 4 devices respectively
131131

132-
raid56
132+
RAID56
133133
(since: 3.9)
134134

135-
the filesystem contains or contained a raid56 profile of block groups
135+
the filesystem contains or contained a RAID56 profile of block groups
136136

137137
rmdir_subvol
138138
(since: 4.18)
@@ -332,7 +332,7 @@ group profiles *RAID1*.
332332
Having just one profile is desired as this also clearly defines the profile of
333333
newly allocated block groups, otherwise this depends on internal allocation
334334
policy. When there are multiple profiles present, the order of selection is
335-
RAID6, RAID5, RAID10, RAID1, RAID0 as long as the device number constraints are
335+
RAID56, RAID10, RAID1, RAID0 as long as the device number constraints are
336336
satisfied.
337337

338338
Commands that print the warning were chosen so they're brought to user
@@ -385,7 +385,7 @@ Missing/incomplete support
385385

386386
When RAID56 is on the same filesystem with different raid profiles, the space
387387
reporting is inaccurate, e.g. **df**, **btrfs filesystem df** or **btrfs filesystem
388-
usage**. When there's only a one profile per block group type (e.g. raid5 for data)
388+
usage**. When there's only a one profile per block group type (e.g. RAID5 for data)
389389
the reporting is accurate.
390390

391391
When scrub is started on a RAID56 filesystem, it's started on all devices that

Documentation/btrfs-receive.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ A subvolume is made read-only after the receiving process finishes successfully
5353
-m <ROOTMOUNT>
5454
the root mount point of the destination filesystem
5555

56-
By default the mountpoint is searched in */proc/self/mounts*.
56+
By default the mount point is searched in */proc/self/mounts*.
5757
If */proc* is not accessible, e.g. in a chroot environment, use this option to
5858
tell us where this filesystem is mounted.
5959

Documentation/btrfs-rescue.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ fix-device-size <device>
5151
WARNING: CPU: 3 PID: 439 at fs/btrfs/ctree.h:1559 btrfs_update_device+0x1c5/0x1d0 [btrfs]
5252
5353
clear-uuid-tree <device>
54-
Clear uuid tree, so that kernel can re-generate it at next read-write
54+
Clear UUID tree, so that kernel can re-generate it at next read-write
5555
mount.
5656

5757
Since kernel v4.16 there are more sanity check performed, and sometimes
58-
non-critical trees like uuid tree can cause problems and reject the mount.
59-
In such case, clearing uuid tree may make the filesystem to be mountable again
58+
non-critical trees like UUID tree can cause problems and reject the mount.
59+
In such case, clearing UUID tree may make the filesystem to be mountable again
6060
without much risk as it's built from other trees.
6161

6262
super-recover [options] <device>

Documentation/btrfstune.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DESCRIPTION
1212
**btrfstune** can be used to enable, disable, or set various filesystem
1313
parameters. The filesystem must be unmounted.
1414

15-
The common usecase is to enable features that were not enabled at mkfs time.
15+
The common use case is to enable features that were not enabled at mkfs time.
1616
Please make sure that you have kernel support for the features. You can find a
1717
complete list of features and kernel version of their introduction at
1818
https://btrfs.wiki.kernel.org/index.php/Changelog#By_feature . Also, the

0 commit comments

Comments
 (0)