Skip to contentSkip to conversation

common/btrfs: source module file

PATCH In review Luis Chamberlain 4 participants 6 messages Nov 4, 2021 – Nov 7, 2021 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/btrfs: source module file

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

Fix this by sourcing common/module in the btrfs common file.

---
 common/btrfs | 2 ++
 1 file changed, 2 insertions(+)
common/btrfs +2 -0
index 5d938c19..4dc4f75d 100644
@@ -2,6 +2,8 @@
 # Common btrfs specific functions
 #
 
+source common/module
+
 _btrfs_get_subvolid()
 {
 	mnt=$1
Signature · 1 line
2.33.0
#1 lore raw
Quoted 9 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

Fix this by sourcing common/module in the btrfs common file.

I'm not sure why you get such a failure. Without the relevant btrfs-progs and btrfs kernel patches, I don't get that error:

$ ./check btrfs/249
FSTYP         -- btrfs
PLATFORM      -- Linux/x86_64 debian9 5.15.0-rc7-btrfs-next-103 #1 SMP
PREEMPT Tue Nov 2 12:25:45 WET 2021
MKFS_OPTIONS  -- /dev/sdb
MOUNT_OPTIONS -- /dev/sdb /home/fdmanana/btrfs-tests/scratch_1

btrfs/249 [failed, exit status 1]- output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/249.out.bad)

    --- tests/btrfs/249.out 2021-10-26 11:04:03.879678608 +0100
    +++ /home/fdmanana/git/hub/xfstests/results//btrfs/249.out.bad
2021-11-05 10:51:53.752113924 +0000
    @@ -1,2 +1,5 @@
     QA output created by 249
    -Silence is golden
    +ERROR: unexpected number of devices: 1 >= 1
    +ERROR: if seed device is used, try running this command as root
    +FAILED: btrfs filesystem usage, ret 1. Check btrfs.ko and

btrfs-progs version.
+(see /home/fdmanana/git/hub/xfstests/results//btrfs/249.full for details)
...
(Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/249.out
/home/fdmanana/git/hub/xfstests/results//btrfs/249.out.bad' to see the entire diff)
Ran: btrfs/249
Failures: btrfs/249
Failed 1 of 1 tests

Maybe Anand, who authored the test, may have an idea.
We do have many other tests that call _require_btrfs_forget_or_module_loadable(), btrfs/124, 125, 163, 164, etc. Does it happen with those as well?

Also, in the future please CC linux-btrfs for changes related to btrfs tests.

Thanks.

Quoted 22 lines
---
 common/btrfs | 2 ++
 1 file changed, 2 insertions(+)
common/btrfs +2 -1
index 5d938c19..4dc4f75d 100644
@@ -2,6 +2,8 @@
 # Common btrfs specific functions
 #
 
+source common/module
+
 _btrfs_get_subvolid()
 {
        mnt=$1
--

2.33.0

Signature · 3 lines
Filipe David Manana,

“Whether you think you can, or you think you can't — you're right.”
#2 lore raw
Quoted 9 lines · Filipe Manana
Quoted 8 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 4 lines
Quoted 1 line

Fix this by sourcing common/module in the btrfs common file.

I'm not sure why you get such a failure. Without the relevant btrfs-progs and btrfs kernel patches, I don't get that error:

I checked all these tests and btrfs/248 and btrfs/249 do not import common/module whilst the others do it so this might be one of the reason.

IMO it would be cleaner to source it in common/btrfs to remove the duplication.

Quoted 62 lines
$ ./check btrfs/249
FSTYP         -- btrfs
PLATFORM      -- Linux/x86_64 debian9 5.15.0-rc7-btrfs-next-103 #1 SMP
PREEMPT Tue Nov 2 12:25:45 WET 2021
MKFS_OPTIONS  -- /dev/sdb
MOUNT_OPTIONS -- /dev/sdb /home/fdmanana/btrfs-tests/scratch_1

btrfs/249 [failed, exit status 1]- output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/249.out.bad)

    --- tests/btrfs/249.out 2021-10-26 11:04:03.879678608 +0100
    +++ /home/fdmanana/git/hub/xfstests/results//btrfs/249.out.bad
2021-11-05 10:51:53.752113924 +0000
    @@ -1,2 +1,5 @@
     QA output created by 249
    -Silence is golden
    +ERROR: unexpected number of devices: 1 >= 1
    +ERROR: if seed device is used, try running this command as root
    +FAILED: btrfs filesystem usage, ret 1. Check btrfs.ko and

btrfs-progs version.
+(see /home/fdmanana/git/hub/xfstests/results//btrfs/249.full for details)
...
(Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/249.out
/home/fdmanana/git/hub/xfstests/results//btrfs/249.out.bad' to see the entire diff)
Ran: btrfs/249
Failures: btrfs/249
Failed 1 of 1 tests

Maybe Anand, who authored the test, may have an idea.
We do have many other tests that call _require_btrfs_forget_or_module_loadable(), btrfs/124, 125, 163, 164, etc. Does it happen with those as well?

Also, in the future please CC linux-btrfs for changes related to btrfs tests.

Thanks.

Quoted 22 lines
---
 common/btrfs | 2 ++
 1 file changed, 2 insertions(+)
common/btrfs +2 -1
index 5d938c19..4dc4f75d 100644
@@ -2,6 +2,8 @@
 # Common btrfs specific functions
 #
 
+source common/module
+
 _btrfs_get_subvolid()
 {
        mnt=$1
--

2.33.0

#5 lore raw
In reply to Filipe Manana
Quoted 9 lines · Filipe Manana
Quoted 8 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 4 lines
Quoted 1 line

Fix this by sourcing common/module in the btrfs common file.

I'm not sure why you get such a failure. Without the relevant btrfs-progs and btrfs kernel patches, I don't get that error:

Are you using a latest fstests?

Quoted 4 lines

Maybe Anand, who authored the test, may have an idea.
We do have many other tests that call _require_btrfs_forget_or_module_loadable(), btrfs/124, 125, 163, 164, etc. Does it happen with those as well?

If that was not an issue before, maybe it is because of commit b47ea0c6973 ("common/module: use patient module removal").

Quoted 1 line

Also, in the future please CC linux-btrfs for changes related to btrfs tests.

Will do, thanks!

Luis

#3 lore raw
In reply to Nikolay Borisov
Quoted 12 lines · Nikolay Borisov
Quoted 9 lines · Filipe Manana
Quoted 8 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
Quoted 4 lines
Quoted 1 line

Fix this by sourcing common/module in the btrfs common file.

I'm not sure why you get such a failure. Without the relevant btrfs-progs and btrfs kernel patches, I don't get that error:

I checked all these tests and btrfs/248 and btrfs/249 do not import common/module whilst the others do it so this might be one of the reason.

Odd btrfs/248 runs fine here.

Quoted 2 lines

IMO it would be cleaner to source it in common/btrfs to remove the duplication.

Sure that works with me. Will send a v2.

Luis

#4 lore raw
Quoted 15 lines · Luis Chamberlain
Quoted 14 lines · Nikolay Borisov
Quoted 11 lines · Filipe Manana
Quoted 9 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

Fix this by sourcing common/module in the btrfs common file.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

I'm not sure why you get such a failure. Without the relevant btrfs-progs and btrfs kernel patches, I don't get that error:

I checked all these tests and btrfs/248 and btrfs/249 do not import common/module whilst the others do it so this might be one of the reason.

Odd btrfs/248 runs fine here.

Thanks for the report and the fix.

I still can't find the reason why btrfs/249 runs fine on my test
system here. (It is the same error as shown in Filipe email).

Quoted 3 lines
Quoted 2 lines

IMO it would be cleaner to source it in common/btrfs to remove the duplication.

Anyways, in general adding common/module to common/btrfs is a good
cleanup.

- Anand

Quoted 4 lines

Sure that works with me. Will send a v2.

Luis