diff mbox series

[v2,2/3] common/btrfs: use $AWK_PROG

Message ID 20220215014845.4164719-3-mcgrof@kernel.org (mailing list archive)
State New, archived
Headers show
Series adjust btrfs/237 uuid heuristics and use AWK_PROG | expand

Commit Message

Luis Chamberlain Feb. 15, 2022, 1:48 a.m. UTC 
Use $AWK_PROG instead of just awk in case the preferred awk
program is different.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 common/btrfs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Johannes Thumshirn Feb. 15, 2022, 3:52 p.m. UTC | #1 
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Adam Manzanares Feb. 17, 2022, 6:26 a.m. UTC | #2 
On Mon, Feb 14, 2022 at 05:48:44PM -0800, Luis Chamberlain wrote:
> Use $AWK_PROG instead of just awk in case the preferred awk
> program is different.
> 
> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
> ---
>  common/btrfs | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/common/btrfs b/common/btrfs
> index 5de926dd..2fdefb18 100644
> --- a/common/btrfs
> +++ b/common/btrfs
> @@ -9,7 +9,7 @@ _btrfs_get_subvolid()
>  	mnt=$1
>  	name=$2
>  
> -	$BTRFS_UTIL_PROG sub list $mnt | egrep "\s$name$" | awk '{ print $2 }'
> +	$BTRFS_UTIL_PROG sub list $mnt | egrep "\s$name$" | $AWK_PROG '{ print $2 }'
>  }
>  
>  # _require_btrfs_command <command> [<subcommand>|<option>]
> @@ -418,7 +418,7 @@ _run_btrfs_balance_start()
>  _scratch_btrfs_sectorsize()
>  {
>  	$BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV |\
> -		grep sectorsize | awk '{print $2}'
> +		grep sectorsize | $AWK_PROG '{print $2}'
>  }
>  
>  _btrfs_supports_forget()
> @@ -460,7 +460,7 @@ _require_btrfs_sysfs_fsid()
>  	local fsid
>  
>  	fsid=$($BTRFS_UTIL_PROG filesystem show $TEST_DIR |grep uuid: |\
> -	       awk '{print $NF}')
> +	       $AWK_PROG '{print $NF}')
>  
>  	# Check if the kernel has sysfs fsid support.
>  	# Following kernel patch adds it:
> -- 
> 2.34.1
>

Looks good.

Reviewed by: Adam Manzanares <a.manzanares@samsung.com>
diff mbox series

Patch

diff --git a/common/btrfs b/common/btrfs
index 5de926dd..2fdefb18 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -9,7 +9,7 @@  _btrfs_get_subvolid()
 	mnt=$1
 	name=$2
 
-	$BTRFS_UTIL_PROG sub list $mnt | egrep "\s$name$" | awk '{ print $2 }'
+	$BTRFS_UTIL_PROG sub list $mnt | egrep "\s$name$" | $AWK_PROG '{ print $2 }'
 }
 
 # _require_btrfs_command <command> [<subcommand>|<option>]
@@ -418,7 +418,7 @@  _run_btrfs_balance_start()
 _scratch_btrfs_sectorsize()
 {
 	$BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV |\
-		grep sectorsize | awk '{print $2}'
+		grep sectorsize | $AWK_PROG '{print $2}'
 }
 
 _btrfs_supports_forget()
@@ -460,7 +460,7 @@  _require_btrfs_sysfs_fsid()
 	local fsid
 
 	fsid=$($BTRFS_UTIL_PROG filesystem show $TEST_DIR |grep uuid: |\
-	       awk '{print $NF}')
+	       $AWK_PROG '{print $NF}')
 
 	# Check if the kernel has sysfs fsid support.
 	# Following kernel patch adds it: