On 3/20/18 10:40 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Make xfs_scrub_all -V report its version like the other xfs tools.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> man/man8/xfs_scrub_all.8 | 10 ++++++++++
> scrub/Makefile | 1 +
> scrub/xfs_scrub_all.in | 11 +++++++++++
> 3 files changed, 22 insertions(+)
>
>
> diff --git a/man/man8/xfs_scrub_all.8 b/man/man8/xfs_scrub_all.8
> index 5e1420b..7454880 100644
> --- a/man/man8/xfs_scrub_all.8
> +++ b/man/man8/xfs_scrub_all.8
> @@ -3,6 +3,9 @@
> xfs_scrub_all \- scrub all mounted XFS filesystems
> .SH SYNOPSIS
> .B xfs_scrub_all
> +[
> +.B \-hV
> +]
> .SH DESCRIPTION
> .B xfs_scrub_all
> attempts to read and check all the metadata on all mounted XFS filesystems.
> @@ -13,6 +16,13 @@ in a restricted fashion.
> Mounted filesystems are mapped to physical storage devices so that scrub
> operations can be run in parallel so long as no two scrubbers access
> the same device simultaneously.
> +.SH OPTIONS
> +.TP
> +.B \-h
> +Display help.
> +.TP
> +.B \-V
> +Prints the version number and exits.
> .SH EXIT CODE
> The exit code returned by
> .B xfs_scrub_all
> diff --git a/scrub/Makefile b/scrub/Makefile
> index bcc05a0..482e8a7 100644
> --- a/scrub/Makefile
> +++ b/scrub/Makefile
> @@ -102,6 +102,7 @@ default: depend $(LTCOMMAND) $(XFS_SCRUB_ALL_PROG) $(OPTIONAL_TARGETS)
> xfs_scrub_all: xfs_scrub_all.in
> @echo " [SED] $@"
> $(Q)$(SED) -e "s|@sbindir@|$(PKG_ROOT_SBIN_DIR)|g" \
> + -e "s|@pkg_version@|$(PKG_VERSION)|g" \
> -e "s|@scrub_args@|$(XFS_SCRUB_ARGS)|g" < $< > $@
> $(Q)chmod a+x $@
>
> diff --git a/scrub/xfs_scrub_all.in b/scrub/xfs_scrub_all.in
> index 80f07d5..aed66a1 100644
> --- a/scrub/xfs_scrub_all.in
> +++ b/scrub/xfs_scrub_all.in
> @@ -26,6 +26,7 @@ import threading
> import time
> import sys
> import os
> +import argparse
>
> retcode = 0
> terminate = False
> @@ -139,6 +140,16 @@ def main():
> thr.start()
> global retcode, terminate
>
> + parser = argparse.ArgumentParser( \
> + description = "Scrub all mounted XFS filesystems.")
> + parser.add_argument("-V", help = "Report version and exit.", \
> + action = "store_true")
> + args = parser.parse_args()
> +
> + if args.V:
> + print("xfs_scrub_all version @pkg_version@")
> + sys.exit(0)
> +
> fs = find_mounts()
>
> # Tail the journal if we ourselves aren't a service...
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
