From 70ff4b82ea80d1f1fecb1fe3e3894323e575cd1d Mon Sep 17 00:00:00 2001
From: Filipe Manana <fdmanana@suse.com>
Date: Fri, 22 Sep 2023 12:45:01 +0100
Subject: [PATCH] btrfs: use full subcommand name at _btrfs_get_subvolid()

Avoid using the shortcut "sub" for the "subvolume" command, as this is the
standard practice because such shortcuts are not guaranteed to exist in
every btrfs-progs release (they may come and go). Also make the variables
local.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---
 common/btrfs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/btrfs b/common/btrfs
index c9903a41..62cee209 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -6,10 +6,10 @@
 
 _btrfs_get_subvolid()
 {
-	mnt=$1
-	name=$2
+	local mnt=$1
+	local name=$2
 
-	$BTRFS_UTIL_PROG sub list $mnt | grep -E "\s$name$" | $AWK_PROG '{ print $2 }'
+	$BTRFS_UTIL_PROG subvolume list $mnt | grep -E "\s$name$" | $AWK_PROG '{ print $2 }'
 }
 
 # _require_btrfs_command <command> [<subcommand>|<option>]
-- 
2.39.5