[v2] fstests: common/btrfs: use complete sub command
diff mbox series

Message ID 1581381911-6727-1-git-send-email-anand.jain@oracle.com
State New
Headers show
Series
  • [v2] fstests: common/btrfs: use complete sub command
Related show

Commit Message

Anand Jain Feb. 11, 2020, 12:45 a.m. UTC
Search for 'subvolume' in the file common/btrfs failed to find all of
them, leading to a wrong inference for a moment.

Make sure we use the full subcommand name in the btrfs command.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Marcos Paulo de Souza <mpdesouza@suse.com>
---
v2: Update commit log.

 common/btrfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Marcos Paulo de Souza Feb. 11, 2020, 1:11 a.m. UTC | #1
On Tue, 2020-02-11 at 08:45 +0800, Anand Jain wrote:
> Search for 'subvolume' in the file common/btrfs failed to find all of
> them, leading to a wrong inference for a moment.
> 
> Make sure we use the full subcommand name in the btrfs command.

Hum, in my tests realted to subvol delete by id[1], this function
successfully got the subvolid for subvol names like subvol[123].. Do
you have a case where it fails? 

> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> Marcos Paulo de Souza <mpdesouza@suse.com>

Here you meant I reviewed the first version of the patch?

Thanks,
  Marcos

[1]: 
https://lore.kernel.org/linux-btrfs/20200207131951.15859-3-marcos.souza.org@gmail.com/

> ---
> v2: Update commit log.
> 
>  common/btrfs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/btrfs b/common/btrfs
> index 19ac7cc4b18c..33ad7e3b41cc 100644
> --- a/common/btrfs
> +++ b/common/btrfs
> @@ -7,7 +7,7 @@ _btrfs_get_subvolid()
>  	mnt=$1
>  	name=$2
>  
> -	$BTRFS_UTIL_PROG sub list $mnt | grep $name | awk '{ print $2
> }'
> +	$BTRFS_UTIL_PROG subvolume list $mnt | grep $name | awk '{
> print $2 }'
>  }
>  
>  # _require_btrfs_command <command> [<subcommand>|<option>]

Patch
diff mbox series

diff --git a/common/btrfs b/common/btrfs
index 19ac7cc4b18c..33ad7e3b41cc 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -7,7 +7,7 @@  _btrfs_get_subvolid()
 	mnt=$1
 	name=$2
 
-	$BTRFS_UTIL_PROG sub list $mnt | grep $name | awk '{ print $2 }'
+	$BTRFS_UTIL_PROG subvolume list $mnt | grep $name | awk '{ print $2 }'
 }
 
 # _require_btrfs_command <command> [<subcommand>|<option>]