summaryrefslogtreecommitdiff
path: root/Documentation/btrfs-scrub.asciidoc
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2016-05-10 10:13:23 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2016-05-10 10:13:23 +0100
commit58e631d01823afd60e52f3a09887f270a91889a0 (patch)
tree6afbca5492c1ad1040608e01fe0c9d909482adeb /Documentation/btrfs-scrub.asciidoc
parentcec572daccafa1e912cbed363df6f84687778c6f (diff)
New upstream release 4.5.2.
* Thanks for NMU of package rename. * New upstream release 4.5.2. * Upload using dgit. * Source-only upload. * btrfs-convert should not be included in the initramfs, but should be compiled. Using btrfs-convert is not a trivial operation, and especially not from a minimal shell. Also it is known to fail, and for a sophisticated user it is trivial to include it in the initramfs. Thus won't fix Closes: #801192 * No sponsorship required Closes: #823474 * Add Provides btrfs-tools-udeb to the -progs-udeb package.
Diffstat (limited to 'Documentation/btrfs-scrub.asciidoc')
-rw-r--r--Documentation/btrfs-scrub.asciidoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/btrfs-scrub.asciidoc b/Documentation/btrfs-scrub.asciidoc
index 7750868d..2335aba2 100644
--- a/Documentation/btrfs-scrub.asciidoc
+++ b/Documentation/btrfs-scrub.asciidoc
@@ -25,7 +25,7 @@ If a <device> is given, the corresponding filesystem is found and
scrub cancel behaves as if it was called on that filesystem.
*resume* [-BdqrR] [-c <ioprio_class> -n <ioprio_classdata>] <path>|<device>::
-Resume a canceled or interrupted scrub cycle on the filesystem identified by
+Resume a cancelled or interrupted scrub cycle on the filesystem identified by
<path> or on a given <device>.
+
Does not start a new scrub if the last scrub finished successfully.
@@ -64,13 +64,13 @@ Set IO priority class (see `ionice`(1) manpage).
Set IO priority classdata (see `ionice`(1) manpage).
-f::::
Force starting new scrub even if a scrub is already running.
-This is useful when scrub stat record file is damaged.
+This is useful when scrub status record file is damaged.
*status* [-d] <path>|<device>::
Show status of a running scrub for the filesystem identified by <path> or
for the specified <device>.
+
-If no scrub is running, show statistics of the last finished or canceled scrub
+If no scrub is running, show statistics of the last finished or cancelled scrub
for that filesystem or device.
+
`Options`