marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: correct manpage option description for scrub 

The -f option of scrub means to
    "force starting new scrub even if a scrub is already running"
*not*
    "force to check whether scrub has started or resumed in userspace"
as described originally.

So replace the orignal description in the manpage and code.

Also, add description of the potential failure as follows
    "If a scrub is already running, it fails."

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: David Sterba <dsterba@suse.cz>
master
Gui Hecheng 2014-07-30 15:32:05 +08:00 committed by David Sterba
parent dfe83649cf
commit a2e2c295d9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/btrfs-scrub.txt
View File

@ -18,7 +18,7 @@ SUBCOMMAND
----------
*start* [-BdqrRf] [-c <ioprio_class> -n <ioprio_classdata>] <path>|<device>::
Start a scrub on all devices of the filesystem identified by <path> or on
a single <device>.
a single <device>. If a scrub is already running, the new one fails.
+
Without options, scrub is started as a background process.
Progress can be obtained with the *scrub status* command. Scrubbing
@ -47,8 +47,8 @@ manpage).
-n <ioprio_classdata>::::
Set IO priority classdata (see `ionice`(1) manpage).
-f::::
force to check whether scrub has started or resumed in userspace.
this is useful when scrub stat record file is damaged.
Force starting new scrub even if a scrub is already running.
This is useful when scrub stat record file is damaged.
*cancel* <path>|<device>::
If a scrub is running on the filesystem identified by <path>, cancel it.

4
cmds-scrub.c
View File

@ -1527,7 +1527,7 @@ out:
static const char * const cmd_scrub_start_usage[] = {
"btrfs scrub start [-BdqrRf] [-c ioprio_class -n ioprio_classdata] <path>|<device>",
"Start a new scrub",
"Start a new scrub. If a scrub is already running, the new one fails.",
"",
"-B do not background",
"-d stats per device (-B only)",
@ -1536,7 +1536,7 @@ static const char * const cmd_scrub_start_usage[] = {
"-R raw print mode, print full data instead of summary"
"-c set ioprio class (see ionice(1) manpage)",
"-n set ioprio classdata (see ionice(1) manpage)",
"-f force to skip checking whether scrub has started/resumed in userspace ",
"-f force starting new scrub even if a scrub is already running.",
" this is useful when scrub stats record file is damaged",
NULL
};