Skip to contentSkip to conversation

common/btrfs: source module file and remove duplicates

PATCH In review Luis Chamberlain 2 participants 2 messages Nov 5, 2021 – Nov 7, 2021 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/btrfs: source module file and remove duplicates

btrfs/249 fails with:

QA output created by 249
./common/btrfs: line 425: _require_loadable_fs_module: command not found ./common/btrfs: line 432: _reload_fs_module: command not found
ERROR: not a btrfs filesystem: /media/scratch

This is because the test is failing to source common/module. Fix this by sourcing common/module in the btrfs common file.

While it it remove duplication of sourcing this file from other tests in btrfs so that this is only done once in one place.

---
 common/btrfs    | 2 ++
 tests/btrfs/124 | 1 -
 tests/btrfs/125 | 1 -
 tests/btrfs/163 | 1 -
 tests/btrfs/164 | 3 ---
 tests/btrfs/219 | 1 -
 tests/btrfs/225 | 1 -
 tests/btrfs/242 | 1 -
 8 files changed, 2 insertions(+), 9 deletions(-)
common/btrfs +2 -0
index 5d938c19..2eab4b29 100644
@@ -2,6 +2,8 @@
 # Common btrfs specific functions
 #
 
+. common/module
+
 _btrfs_get_subvolid()
 {
 	mnt=$1
tests/btrfs/124 +0 -1
index 5c05ffae..8771a3c1 100755
@@ -35,7 +35,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
tests/btrfs/125 +0 -1
index e46b194d..b6a28f5c 100755
@@ -34,7 +34,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
tests/btrfs/163 +0 -1
index 76553831..1dc081f1 100755
@@ -27,7 +27,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 . ./common/filter.btrfs
-. ./common/module
 
 # real QA test starts here
 
tests/btrfs/164 +0 -3
index 59a9c90e..3e69b35f 100755
@@ -20,9 +20,6 @@ _cleanup()
 	_btrfs_rescan_devices
 }
 
-# Import common functions.
-. ./common/module
-
 # real QA test starts here
 
 # Modify as appropriate.
tests/btrfs/219 +0 -1
index 1cd5daae..528175b8 100755
@@ -35,7 +35,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
tests/btrfs/225 +0 -1
index ce1818db..408c03d2 100755
@@ -25,7 +25,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
tests/btrfs/242 +0 -1
index e1c102ae..6ce62081 100755
@@ -13,7 +13,6 @@ _begin_fstest auto quick volume trim
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 _supported_fs btrfs
Signature · 1 line
2.33.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Luis Chamberlain

btrfs/249 fails with:

QA output created by 249
./common/btrfs: line 425: _require_loadable_fs_module: command not found ./common/btrfs: line 432: _reload_fs_module: command not found
ERROR: not a btrfs filesystem: /media/scratch

Quoted 7 lines

This is because the test is failing to source common/module. Fix this by sourcing common/module in the btrfs common file.

While it it remove duplication of sourcing this file from other tests in btrfs so that this is only done once in one place.