From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
To: dsterba@suse.com, wqu@suse.com, linux-btrfs@vger.kernel.org,
fstests@vger.kernel.org
Cc: Marcos Paulo de Souza <mpdesouza@suse.com>
Subject: [PATCHv2 1/2] common: btrfs: Improve _require_btrfs_command
Date: Fri, 7 Feb 2020 10:19:50 -0300 [thread overview]
Message-ID: <20200207131951.15859-2-marcos.souza.org@gmail.com> (raw)
In-Reply-To: <20200207131951.15859-1-marcos.souza.org@gmail.com>
From: Marcos Paulo de Souza <mpdesouza@suse.com>
Now _require_btrfs_command can also check for subfuntion options, like
"subvolume delete --subvolid".
Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>
---
Changes from v1:
* New patch expanding the funtionality of _require_btrfs_command, which now
check for argument of subcommands
common/btrfs | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/common/btrfs b/common/btrfs
index 19ac7cc4..ae3142b6 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -12,12 +12,14 @@ _btrfs_get_subvolid()
# _require_btrfs_command <command> [<subcommand>|<option>]
# We check for btrfs and (optionally) features of the btrfs command
-# It can both subfunction like "inspect-internal dump-tree" and
-# options like "check --qgroup-report"
+# This function support both subfunction like "inspect-internal dump-tree" and
+# options like "check --qgroup-report", and also subfunction options like
+# "subvolume delete --subvolid"
_require_btrfs_command()
{
local cmd=$1
local param=$2
+ local param_arg=$3
local safe_param
_require_command "$BTRFS_UTIL_PROG" btrfs
@@ -39,6 +41,13 @@ _require_btrfs_command()
$BTRFS_UTIL_PROG $cmd $param --help &> /dev/null
[ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param)"
+
+ test -z "$param_arg" && return
+
+ # replace leading "-"s for grep
+ safe_param=$(echo $param_arg | sed 's/^-*//')
+ $BTRFS_UTIL_PROG $cmd $param --help | grep -wq $safe_param || \
+ _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param $param_arg)"
}
# Require extra check on btrfs qgroup numbers
--
2.24.0
next prev parent reply other threads:[~2020-02-07 13:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 13:19 [PATCHv2 0/2] btrfs: Test subvolume delete by id feature Marcos Paulo de Souza
2020-02-07 13:19 ` Marcos Paulo de Souza [this message]
2020-02-07 13:25 ` [PATCHv2 1/2] common: btrfs: Improve _require_btrfs_command Nikolay Borisov
2020-02-07 13:19 ` [PATCHv2 2/2] btrfs: Test subvolume delete --subvolid feature Marcos Paulo de Souza
2020-02-17 13:10 ` Eryu Guan
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=20200207131951.15859-2-marcos.souza.org@gmail.com \
--to=marcos.souza.org@gmail.com \
--cc=dsterba@suse.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=mpdesouza@suse.com \
--cc=wqu@suse.com \
/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;
as well as URLs for NNTP newsgroup(s).