Skip to contentSkip to conversation

xfs/32: fix test failure on kernels which don't support bs > ps

PATCH In review Theodore Ts'o 3 participants 7 messages Jan 17, 2025 – Jan 21, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs/32: fix test failure on kernels which don't support bs > ps

When trying to mount a file system with a block size > page size on kernel which doesn't support this, suppress the error messages from showing up in the output file lest it cause test failures.

Fixes 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")
---
 tests/xfs/032 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/032 +1 -1
index 41a9134d8..9c1741cf1 100755
@@ -44,7 +44,7 @@ for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do
 		if [ $? -ne 0 ]; then
 			continue
 		fi
-		if ! _try_scratch_mount; then
+		if ! _try_scratch_mount >& /dev/null ; then
 			if [ $BLOCKSIZE -le $PAGESIZE ]; then
 				_fail "mount $(_scratch_mount_options $*) failed"
 			fi
Signature · 1 line
2.45.2
#1 lore raw
Quoted 15 lines · Theodore Ts'o

When trying to mount a file system with a block size > page size on kernel which doesn't support this, suppress the error messages from showing up in the output file lest it cause test failures.

Fixes 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")
---
 tests/xfs/032 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/032 +0 -0
index 41a9134d8..9c1741cf1 100755

tests/xfs/032 for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do · line 47

Quoted 5 lines
tests/xfs/032 +1 -1
@@ -44,7 +44,7 @@ for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do
 		if [ $? -ne 0 ]; then
 			continue
 		fi
-		if ! _try_scratch_mount; then
+		if ! _try_scratch_mount >& /dev/null ; then

Should we dump that to $seqres.full instead of discarding it?

--D

Quoted 7 lines
tests/xfs/032 +0 -0
 			if [ $BLOCKSIZE -le $PAGESIZE ]; then
 				_fail "mount $(_scratch_mount_options $*) failed"
 			fi
Signature · 1 line
2.45.2
#2 lore raw

PATCH 1/1 xfs/32: fix test failure on kernels which don't support bs > ps

When trying to mount a file system with a block size > page size on kernel which doesn't support this, suppress the error messages from showing up in the output file lest it cause test failures.

Fixes 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")

---
v2:
As Darrick suggested redirect the output of mount(8) to $seqres.full instead of /dev/null

 tests/xfs/032 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/032 +1 -1
index 41a9134d8..675881d5b 100755
@@ -44,7 +44,7 @@ for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do
 		if [ $? -ne 0 ]; then
 			continue
 		fi
-		if ! _try_scratch_mount; then
+		if ! _try_scratch_mount >> $seqres.full 2>&1 ; then
 			if [ $BLOCKSIZE -le $PAGESIZE ]; then
 				_fail "mount $(_scratch_mount_options $*) failed"
 			fi
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#3 lore raw
Quoted 10 lines · Theodore Ts'o

When trying to mount a file system with a block size > page size on kernel which doesn't support this, suppress the error messages from showing up in the output file lest it cause test failures.

Fixes 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")

---
v2:
As Darrick suggested redirect the output of mount(8) to $seqres.full instead of /dev/null

Thanks for fixing it.

Quoted 21 lines
 tests/xfs/032 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/032 +1 -1
index 41a9134d8..675881d5b 100755
@@ -44,7 +44,7 @@ for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do
 		if [ $? -ne 0 ]; then
 			continue
 		fi
-		if ! _try_scratch_mount; then
+		if ! _try_scratch_mount >> $seqres.full 2>&1 ; then
 			if [ $BLOCKSIZE -le $PAGESIZE ]; then
 				_fail "mount $(_scratch_mount_options $*) failed"
 			fi
Signature · 1 line
2.45.2
#4 lore raw
Quoted 12 lines · Zorro Lang
Quoted 10 lines · Theodore Ts'o

When trying to mount a file system with a block size > page size on kernel which doesn't support this, suppress the error messages from showing up in the output file lest it cause test failures.

Fixes 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")

---
v2:
As Darrick suggested redirect the output of mount(8) to $seqres.full instead of /dev/null

Quoted 3 lines

Thanks for fixing it.

I just noticed just now that I screwed up the subject line / commit description.

xfs/32: ...

should be:

xfs/032: ...

Sorry for not noticing this earlier!

- Ted

#5 lore raw
Quoted 19 lines · Theodore Ts'o
Quoted 12 lines · Zorro Lang
Quoted 10 lines · Theodore Ts'o

When trying to mount a file system with a block size > page size on kernel which doesn't support this, suppress the error messages from showing up in the output file lest it cause test failures.

Fixes 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")

---
v2:
As Darrick suggested redirect the output of mount(8) to $seqres.full instead of /dev/null

Quoted 3 lines

Thanks for fixing it.

I just noticed just now that I screwed up the subject line / commit description.

Quoted 7 lines

xfs/32: ...

should be:

xfs/032: ...

Sorry for not noticing this earlier!

Never mind, I've changed that when I merge it :)

Quoted 3 lines

- Ted

Reviewed-by on v1 1/1
#6 lore raw
In reply to Theodore Ts'o
Quoted 6 lines · Theodore Ts'o

When trying to mount a file system with a block size > page size on kernel which doesn't support this, suppress the error messages from showing up in the output file lest it cause test failures.

Fixes 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")

Looks ok,

--D

Quoted 25 lines

---
v2:
As Darrick suggested redirect the output of mount(8) to $seqres.full instead of /dev/null

 tests/xfs/032 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/032 +1 -1
index 41a9134d8..675881d5b 100755
@@ -44,7 +44,7 @@ for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do
 		if [ $? -ne 0 ]; then
 			continue
 		fi
-		if ! _try_scratch_mount; then
+		if ! _try_scratch_mount >> $seqres.full 2>&1 ; then
 			if [ $BLOCKSIZE -le $PAGESIZE ]; then
 				_fail "mount $(_scratch_mount_options $*) failed"
 			fi
Signature · 1 line
2.45.2