Skip to contentSkip to conversation

common: fix _require_xfs_io_command for specific swapext versions

PATCH In review Christoph Hellwig 2 participants 3 messages Nov 8, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common: fix _require_xfs_io_command for specific swapext versions

The xfs_io command (only in Darricks trees and not upstream yet) supports the -v switch to select the swapext version. When the selected swapext version is not supported it reports a 'version must be $foo' message. Parse that and don't _notfun the test cases.

This fixes various generic tests trying to use the vfs version that doesn't exist in most branches implementing the swapext command.

---
 common/rc | 2 ++
 1 file changed, 2 insertions(+)
common/rc +2 -0
index 26a26085..d8a0b19b 100644
@@ -2706,6 +2706,8 @@ _require_xfs_io_command()
 			_notrun "xfs_io $command $param ioctl support is missing"
 		echo $testio | grep -q "Operation not supported" && \
 			_notrun "xfs_io $command $param kernel support is missing"
+		echo $testio | grep -q "version must" && \
+			_notrun "xfs_io $command $param kernel support is missing"
 		rm -f $testfile.1
 		param_checked="$param"
 		;;
Signature · 1 line
2.39.2
#1 lore raw
Quoted 4 lines · Christoph Hellwig

The xfs_io command (only in Darricks trees and not upstream yet) supports the -v switch to select the swapext version. When the selected swapext version is not supported it reports a 'version must be $foo' message. Parse that and don't _notfun the test cases.

Er... which _require_xfs_io_command call fails? The only patch that adds 'version must' adds both '-v swapext' and '-v exchrange', and AFAICT all tests use one or the other if they specify a -v at all.

--D

Quoted 25 lines

This fixes various generic tests trying to use the vfs version that doesn't exist in most branches implementing the swapext command.

---
 common/rc | 2 ++
 1 file changed, 2 insertions(+)
common/rc +2 -0
index 26a26085..d8a0b19b 100644
@@ -2706,6 +2706,8 @@ _require_xfs_io_command()
 			_notrun "xfs_io $command $param ioctl support is missing"
 		echo $testio | grep -q "Operation not supported" && \
 			_notrun "xfs_io $command $param kernel support is missing"
+		echo $testio | grep -q "version must" && \
+			_notrun "xfs_io $command $param kernel support is missing"
 		rm -f $testfile.1
 		param_checked="$param"
 		;;
Signature · 1 line
2.39.2
#2 lore raw
Quoted 9 lines · Darrick J. Wong
Quoted 4 lines · Christoph Hellwig

The xfs_io command (only in Darricks trees and not upstream yet) supports the -v switch to select the swapext version. When the selected swapext version is not supported it reports a 'version must be $foo' message. Parse that and don't _notfun the test cases.

Er... which _require_xfs_io_command call fails? The only patch that adds 'version must' adds both '-v swapext' and '-v exchrange', and AFAICT all tests use one or the other if they specify a -v at all.

DOH. I forgot that the command line switches all got renamed when I withdrew FIEXCHANGE from consideration as a VFS concept and turned it back into a private XFS ioctl.

I'm about to email the conversion series for fstests that absorbs that
change. Would you mind taking a look to see if that solves your
problems?

--D

Quoted 28 lines

--D

Quoted 25 lines

This fixes various generic tests trying to use the vfs version that doesn't exist in most branches implementing the swapext command.

---
 common/rc | 2 ++
 1 file changed, 2 insertions(+)
common/rc +2 -0
index 26a26085..d8a0b19b 100644
@@ -2706,6 +2706,8 @@ _require_xfs_io_command()
 			_notrun "xfs_io $command $param ioctl support is missing"
 		echo $testio | grep -q "Operation not supported" && \
 			_notrun "xfs_io $command $param kernel support is missing"
+		echo $testio | grep -q "version must" && \
+			_notrun "xfs_io $command $param kernel support is missing"
 		rm -f $testfile.1
 		param_checked="$param"
 		;;
Signature · 1 line
2.39.2