diff mbox series

xfs_admin: don't add '=1' when building repair command line for -O

Message ID 20210302172753.GO7272@magnolia (mailing list archive)
State Accepted
Headers show
Series xfs_admin: don't add '=1' when building repair command line for -O | expand

Commit Message

Darrick J. Wong March 2, 2021, 5:27 p.m. UTC 
From: Darrick J. Wong <djwong@kernel.org>

Geert Hendrickx reported an inconsistency between the xfs_admin manpage
and its behavior -- the documentation says that users must provide the
status explicitly, but the script injects '=1' anyway.  While this seems
to work with the glibc getsubopt, it's a bit ugly and isn't consistent
with the docs.

So, get rid of that extra two bytes.

Reported-by: Geert Hendrickx <geert@hendrickx.be>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 db/xfs_admin.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Sandeen March 2, 2021, 6:13 p.m. UTC | #1 
On 3/2/21 11:27 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Geert Hendrickx reported an inconsistency between the xfs_admin manpage
> and its behavior -- the documentation says that users must provide the
> status explicitly, but the script injects '=1' anyway.  While this seems
> to work with the glibc getsubopt, it's a bit ugly and isn't consistent
> with the docs.
> 
> So, get rid of that extra two bytes.

Neato! Nice catch, Geert, thanks.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> Reported-by: Geert Hendrickx <geert@hendrickx.be>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
>  db/xfs_admin.sh |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
> index 7a467dbe..02f34b73 100755
> --- a/db/xfs_admin.sh
> +++ b/db/xfs_admin.sh
> @@ -20,7 +20,7 @@ do
>  	j)	DB_OPTS=$DB_OPTS" -c 'version log2'";;
>  	l)	DB_OPTS=$DB_OPTS" -r -c label";;
>  	L)	DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";;
> -	O)	REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG=1";;
> +	O)	REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG";;
>  	p)	DB_OPTS=$DB_OPTS" -c 'version projid32bit'";;
>  	r)	REPAIR_DEV_OPTS=" -r '$OPTARG'";;
>  	u)	DB_OPTS=$DB_OPTS" -r -c uuid";;
>
diff mbox series

Patch

diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
index 7a467dbe..02f34b73 100755
--- a/db/xfs_admin.sh
+++ b/db/xfs_admin.sh
@@ -20,7 +20,7 @@  do
 	j)	DB_OPTS=$DB_OPTS" -c 'version log2'";;
 	l)	DB_OPTS=$DB_OPTS" -r -c label";;
 	L)	DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";;
-	O)	REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG=1";;
+	O)	REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG";;
 	p)	DB_OPTS=$DB_OPTS" -c 'version projid32bit'";;
 	r)	REPAIR_DEV_OPTS=" -r '$OPTARG'";;
 	u)	DB_OPTS=$DB_OPTS" -r -c uuid";;