trivial

1 files changed, 10 insertions, 10 deletions

diff --git a/list-all-subvolumes b/list-all-subvolumes
index d438832..4756e07 100755
--- a/list-all-subvolumes
+++ b/list-all-subvolumes
@@ -2,9 +2,17 @@
 set -e -o pipefail
 btrfs_subvolume_list_args=('-a' "$@")
 
+list_mounted_btrfs_devices()
+{
+    mount -t btrfs | while read
+    do
+        printf '%s\n' "${REPLY%% *}"
+    done | sort -u
+}
+
 list_all_subvolumes()
 {
-    for dev in $(list_btrfs)
+    for dev in $(list_mounted_btrfs_devices)
     do
         [ -b "$dev" ] || return
         d=btrfs/pid-$$/$(systemd-escape "$dev")
@@ -56,14 +64,6 @@ extract_subvolume_path()
     done
 }
 
-list_btrfs()
-{
-    mount -t btrfs | while read
-    do
-        printf '%s\n' "${REPLY%% *}"
-    done | sort -u
-}
-
 datetime_glob_a=.snapshot~[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9]:[0-9][0-9]
 
 datetime_glob_b=*_mirror.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]_[0-9][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9]:[0-9][0-9]
@@ -86,5 +86,5 @@ if [ "$SQUASH_SNAPSHOTS" ]
 then
     list_all_subvolumes "${btrfs_subvolume_list_args[@]}" | sort -u | squash_snapshots
 else
-    list_all_subvolumes "${btrfs_subvolume_list_args[@]}"
+    list_all_subvolumes "${btrfs_subvolume_list_args[@]}" | sort -u
 fi