From: Christoph Hellwig <hch@lst.de>
Date: Fri, 21 Nov 2025 07:10:06 +0000 (+0100)
Subject: xfs/049: create the nested XFS file systems on the loop device
X-Git-Tag: v2025.12.09~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74c8afa4f132a4169ad15f7ee663346eedcd8e82;p=xfstests-dev.git

xfs/049: create the nested XFS file systems on the loop device

Without this I see failures on 4k sector size RT devices, as mkfs.xfs
can't pick up the logical block size on files.  Note that the test
already does this for the nested ext2 image as well.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/xfs/049 b/tests/xfs/049
index 07feb58c..a3f478fa 100755
--- a/tests/xfs/049
+++ b/tests/xfs/049
@@ -58,7 +58,9 @@ mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seqres.full 2>&1 \
     || _fail "!!! failed to mount"
 
 _log "Create xfs fs in file on scratch"
-${MKFS_XFS_PROG} -f -dfile,name=$SCRATCH_MNT/test.xfs,size=40m \
+truncate -s 40m $SCRATCH_MNT/test.xfs
+loop_dev1=$(_create_loop_device $SCRATCH_MNT/test.xfs)
+${MKFS_XFS_PROG} -f $loop_dev1 \
     >> $seqres.full 2>&1 \
     || _fail "!!! failed to mkfs xfs"
 
@@ -67,7 +69,6 @@ mkdir $SCRATCH_MNT/test $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
     || _fail "!!! failed to make mount points"
 
 _log "Mount xfs via loop"
-loop_dev1=$(_create_loop_device $SCRATCH_MNT/test.xfs)
 _mount $loop_dev1 $SCRATCH_MNT/test >> $seqres.full 2>&1 \
     || _fail "!!! failed to loop mount xfs"