Skip to contentSkip to conversation

btrfs/315: update filter to match mount cmd

PATCH In review An Long 3 participants 6 messages Sep 23, 2024 – Oct 14, 2024 Btrfs file system

lore
Share & tools
lore

An Long

author
#0 lore raw

PATCH v2 1/1 btrfs/315: update filter to match mount cmd

Mount error info changed since util-linux v2.40
(91ea38e libmount: report failed syscall name).
So update _filter_mount_error() to match it.

---
 tests/btrfs/315 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tests/btrfs/315 +0 -0
index 5852afad..5101a9a3 100755
@@ -39,7 +39,11 @@ _filter_mount_error()
        # mount: <mnt-point>: fsconfig system call failed: File exists.
        # dmesg(1) may have more information after failed mount system

call.

- grep -v dmesg | _filter_test_dir | sed -e
"s/mount(2)\|fsconfig//g"
+ # For util-linux v2.4 and later:
+ # mount: <mountpoint>: mount system call failed: File exists.
+
+ grep -v dmesg | _filter_test_dir | sed -e
"s/mount(2)\|fsconfig//g" | \
+ sed -E "s/mount( system call failed:)/\1/"
}

seed_device_must_fail()

Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 6 lines · An Long

Mount error info changed since util-linux v2.40
(91ea38e libmount: report failed syscall name).
So update _filter_mount_error() to match it.

Looks good, thanks.

Quoted 28 lines
---
 tests/btrfs/315 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tests/btrfs/315 +0 -0
index 5852afad..5101a9a3 100755
@@ -39,7 +39,11 @@ _filter_mount_error()
        # mount: <mnt-point>: fsconfig system call failed: File exists.
        # dmesg(1) may have more information after failed mount system

call.

- grep -v dmesg | _filter_test_dir | sed -e
"s/mount(2)\|fsconfig//g"

tests/btrfs/315 +4 -0
+       # For util-linux v2.4 and later:
+       # mount: <mountpoint>: mount system call failed: File exists.
+
+       grep -v dmesg | _filter_test_dir | sed -e

"s/mount(2)\|fsconfig//g" | \
+ sed -E "s/mount( system call failed:)/\1/"
}

seed_device_must_fail()
--
2.43.0

#2 lore raw
In reply to An Long
Quoted 24 lines · An Long

Mount error info changed since util-linux v2.40
(91ea38e libmount: report failed syscall name).
So update _filter_mount_error() to match it.

---
 tests/btrfs/315 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tests/btrfs/315 +0 -0
index 5852afad..5101a9a3 100755
@@ -39,7 +39,11 @@ _filter_mount_error()
        # mount: <mnt-point>: fsconfig system call failed: File exists.
        # dmesg(1) may have more information after failed mount system

call.

- grep -v dmesg | _filter_test_dir | sed -e
"s/mount(2)\|fsconfig//g"

tests/btrfs/315 +4 -0
+       # For util-linux v2.4 and later:
+       # mount: <mountpoint>: mount system call failed: File exists.
+
+       grep -v dmesg | _filter_test_dir | sed -e
Quoted 2 lines

"s/mount(2)\|fsconfig//g" | \
+ sed -E "s/mount( system call failed:)/\1/"

Oh, there's a local _filter_mount_error() in btrfs/315. I thought you can change the common helper _filter_error_mount() in common/filter. So maybe you can merge this _filter_mount_error into that common helper in another patch, then other test cases can use it.

Thanks,
Zorro

Quoted 7 lines

}

seed_device_must_fail()

Signature · 1 line
2.43.0
#3 lore raw
Quoted 20 lines · Zorro Lang
Quoted 18 lines · An Long

Mount error info changed since util-linux v2.40
(91ea38e libmount: report failed syscall name).
So update _filter_mount_error() to match it.

---
 tests/btrfs/315 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tests/btrfs/315 +0 -0
index 5852afad..5101a9a3 100755
@@ -39,7 +39,11 @@ _filter_mount_error()
        # mount: <mnt-point>: fsconfig system call failed: File exists.
        # dmesg(1) may have more information after failed mount system

call.

Quoted 13 lines
Quoted 8 lines

- grep -v dmesg | _filter_test_dir | sed -e
"s/mount(2)\|fsconfig//g"

tests/btrfs/315 +4 -0
+       # For util-linux v2.4 and later:
+       # mount: <mountpoint>: mount system call failed: File exists.
+
+       grep -v dmesg | _filter_test_dir | sed -e

"s/mount(2)\|fsconfig//g" | \
+ sed -E "s/mount( system call failed:)/\1/"

Oh, there's a local _filter_mount_error() in btrfs/315. I thought you can change the common helper _filter_error_mount() in common/filter. So maybe you can merge this _filter_mount_error into that common helper in another patch, then other test cases can use it.

This patch missed the last update.
Was the cleanup to use the filter from common/filter required before merging this?

Thanks.

Quoted 14 lines

Thanks,
Zorro

Quoted 7 lines

}

seed_device_must_fail()
--
2.43.0

Reviewed-by
#4 lore raw
Quoted 35 lines · Filipe Manana
Quoted 20 lines · Zorro Lang
Quoted 18 lines · An Long

Mount error info changed since util-linux v2.40
(91ea38e libmount: report failed syscall name).
So update _filter_mount_error() to match it.

---
 tests/btrfs/315 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tests/btrfs/315 +0 -0
index 5852afad..5101a9a3 100755
@@ -39,7 +39,11 @@ _filter_mount_error()
        # mount: <mnt-point>: fsconfig system call failed: File exists.
        # dmesg(1) may have more information after failed mount system

call.

Quoted 13 lines
Quoted 8 lines

- grep -v dmesg | _filter_test_dir | sed -e
"s/mount(2)\|fsconfig//g"

tests/btrfs/315 +4 -0
+       # For util-linux v2.4 and later:
+       # mount: <mountpoint>: mount system call failed: File exists.
+
+       grep -v dmesg | _filter_test_dir | sed -e

"s/mount(2)\|fsconfig//g" | \
+ sed -E "s/mount( system call failed:)/\1/"

Oh, there's a local _filter_mount_error() in btrfs/315. I thought you can change the common helper _filter_error_mount() in common/filter. So maybe you can merge this _filter_mount_error into that common helper in another patch, then other test cases can use it.

Quoted 3 lines

This patch missed the last update.
Was the cleanup to use the filter from common/filter required before merging this?

Thanks Filipe, I'll merge this patch at first.

Hi An, this patch has same issue with the other one you sent recently:

  $ git am -s ./v2_20240923_lan_btrfs_315_update_filter_to_match_mount_cmd.mbx
  Applying: btrfs/315: update filter to match mount cmd
  error: corrupt patch at line 12
  Patch failed at 0001 btrfs/315: update filter to match mount cmd
  ...

They all have "corrupt" data, maybe you can check the way you generate and send patches, better to not change the .patch file manually before sending. I'll merge this patch manually to catch up the release of this week, so don't need one more version :)

Quoted 18 lines

Thanks.

Quoted 14 lines

Thanks,
Zorro

Quoted 7 lines

}

seed_device_must_fail()
--
2.43.0

author
#5 lore raw
Quoted 60 lines · Zorro Lang
Quoted 42 lines · Filipe Manana
Quoted 32 lines · Zorro Lang
Quoted 20 lines · An Long

Mount error info changed since util-linux v2.40
(91ea38e libmount: report failed syscall name).
So update _filter_mount_error() to match it.

---
 tests/btrfs/315 | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)
tests/btrfs/315 +0 -0
index 5852afad..5101a9a3 100755
@@ -39,7 +39,11 @@ _filter_mount_error()
         # mount: <mnt-point>: fsconfig system call failed: File

exists.
        # dmesg(1) may have more information after failed mount system
call.

Quoted 9 lines

-       grep -v dmesg | _filter_test_dir | sed -e "s/mount(2)\|fsconfig//g"
+       # For util-linux v2.4 and later:
+       # mount: <mountpoint>: mount system call failed: File exists.
+
+       grep -v dmesg | _filter_test_dir | sed -e "s/mount(2)\|fsconfig//g" | \
+        sed -E "s/mount( system call failed:)/\1/"

Quoted 7 lines

Oh, there's a local _filter_mount_error() in btrfs/315. I thought you can
change the common helper _filter_error_mount() in common/filter. So maybe
you can merge this _filter_mount_error into that common helper in another
patch, then other test cases can use it.

Quoted 4 lines

This patch missed the last update.
Was the cleanup to use the filter from common/filter required before
merging this?

Thanks Filipe, I'll merge this patch at first.

Hi An, this patch has same issue with the other one you sent recently:

  $ git am -s
./v2_20240923_lan_btrfs_315_update_filter_to_match_mount_cmd.mbx
  Applying: btrfs/315: update filter to match mount cmd
  error: corrupt patch at line 12
  Patch failed at 0001 btrfs/315: update filter to match mount cmd
  ...
Quoted 7 lines

They all have "corrupt" data, maybe you can check the way you generate and
send patches, better to not change the .patch file manually before sending.
I'll merge this patch manually to catch up the release of this week, so
don't need one more version :)

Thank you so much!
I've fixed this problem and it won't happen again ^_^

Quoted 22 lines
Quoted 18 lines

Thanks.

Quoted 14 lines

Thanks,
Zorro

Quoted 7 lines

 }

 seed_device_must_fail()
--
2.43.0

Signature · 2 lines
An Long <[email protected]>
SUSE QE LSG, QE 2, Beijing