From: Dave Chinner <david@fromorbit.com>
To: fstests@vger.kernel.org
Subject: [PATCH] common/xfs: Initialise OPTIND for getopts calls
Date: Fri, 23 Feb 2018 14:54:54 +1100 [thread overview]
Message-ID: <20180223035454.1406-1-david@fromorbit.com> (raw)
From: Dave Chinner <dchinner@redhat.com>
According to the bash man page:
OPTIND is initialized to 1 each time the shell or a shell
script is invoked.
This doesn't appear to be true - in tests scripts with no other
getopts calls, I'm seeing the getopts loop in _xfs_check to fail
to parse input parameters correctly. Tracing shows the parameters
are being passed to _xfs_check correctly, but on occassion getopts
simply doesn't see the,
Hence when running tests with both external log and real time
devices, tests are failing at random because xfs_check is
mis-parsing the parameters passed to it and not configuring the
external log correctly:
_check_xfs_filesystem: filesystem on /dev/sdg is inconsistent (c)
*** xfs_check output ***
aborting - no external log specified for FS with an external log
*** end xfs_check output
Fix this by ensuring OPTIND is correctly initialised before using
getopts. Do it for all places that call getopts that don't already
set OPTIND=1 before starting their parsing loop.
Signed-Off-By: Dave Chinner <dchinner@redhat.com>
---
common/xfs | 1 +
tests/generic/074 | 1 +
tests/generic/075 | 1 +
tests/generic/112 | 1 +
4 files changed, 4 insertions(+)
diff --git a/common/xfs b/common/xfs
index 2cb77778831a..2aff1b3bcb5c 100644
--- a/common/xfs
+++ b/common/xfs
@@ -119,6 +119,7 @@ _xfs_check()
DBOPTS=" "
USAGE="Usage: xfs_check [-fsvV] [-l logdev] [-i ino]... [-b bno]... special"
+ OPTIND=1
while getopts "b:fi:l:stvV" c; do
case $c in
s) OPTS=$OPTS"-s ";;
diff --git a/tests/generic/074 b/tests/generic/074
index 5f205b509eb6..d39f9a3d4309 100755
--- a/tests/generic/074
+++ b/tests/generic/074
@@ -87,6 +87,7 @@ _usage()
_process_args()
{
+ OPTIND=1
while getopts "f:l:n:?" c $@
do
case $c
diff --git a/tests/generic/075 b/tests/generic/075
index 321c72177618..e9dd4a5c5dcd 100755
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -98,6 +98,7 @@ _usage()
_process_args()
{
+ OPTIND=1
while getopts "l:n:N:?" c $@
do
case $c
diff --git a/tests/generic/112 b/tests/generic/112
index 0ab1c8c87907..5ab1cb3ad4ca 100755
--- a/tests/generic/112
+++ b/tests/generic/112
@@ -94,6 +94,7 @@ _usage()
_process_args()
{
+ OPTIND=1
while getopts "l:n:N:?" c $@
do
case $c
--
2.16.1
next reply other threads:[~2018-02-23 3:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-23 3:54 Dave Chinner [this message]
2018-02-23 4:29 ` [PATCH] common/xfs: Initialise OPTIND for getopts calls Eryu Guan
2018-02-23 4:56 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180223035454.1406-1-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox