From: Amir Goldstein Date: Sun, 13 Nov 2016 13:49:37 +0000 (+0200) Subject: generic/37[3-4]: use bind mount instead of 2nd _scratch_mount X-Git-Tag: v2022.05.01~2301 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cbc87660d50cc276bb17e49ab69f8a3ca8537d7b;p=users%2Fhch%2Fxfstests-dev.git generic/37[3-4]: use bind mount instead of 2nd _scratch_mount generic/373 and generic/374 test that cross-mountpoint reflink/dedupe fail with EXDEV. For this test, _scratch_mount is called a 2nd time with same mount arguments, but a different value of SCRATCH_MNT. This practice is incorrect for overlayfs, which should not be using the same upper/work dirs on two different overlay super blocks. Change the test to use bind mount instead, which results in the expected setup for both block device mount and overlay mount. Signed-off-by: Amir Goldstein Reviewed-by: Darrick J. Wong Signed-off-by: Eryu Guan --- diff --git a/tests/generic/373 b/tests/generic/373 index cf585baf3..339ed7066 100755 --- a/tests/generic/373 +++ b/tests/generic/373 @@ -64,7 +64,7 @@ blksz=65536 sz=$((blksz * blocks)) echo "Mount otherdir" -SCRATCH_MNT=$otherdir _scratch_mount +$MOUNT_PROG --bind $SCRATCH_MNT $otherdir echo "Create file" _pwrite_byte 0x61 0 $sz $testdir/file >> $seqres.full @@ -82,7 +82,7 @@ md5sum $testdir/file | _filter_scratch test -e $othertestdir/otherfile && echo "otherfile should not exist" echo "Unmount otherdir" -SCRATCH_MNT=$otherdir _scratch_unmount +$UMOUNT_PROG $otherdir rm -rf $otherdir # success, all done diff --git a/tests/generic/374 b/tests/generic/374 index 0173c1328..eabaf2e1c 100755 --- a/tests/generic/374 +++ b/tests/generic/374 @@ -63,7 +63,7 @@ blksz=65536 sz=$((blocks * blksz)) echo "Mount otherdir" -SCRATCH_MNT=$otherdir _scratch_mount +$MOUNT_PROG --bind $SCRATCH_MNT $otherdir echo "Create file" _pwrite_byte 0x61 0 $sz $testdir/file >> $seqres.full @@ -80,7 +80,7 @@ echo "Check output" md5sum $testdir/file $othertestdir/otherfile | filter_md5 echo "Unmount otherdir" -SCRATCH_MNT=$otherdir _scratch_unmount +$UMOUNT_PROG $otherdir rm -rf $otherdir # success, all done