mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfstests: always use test option when checking large scratch device
Some tests call _check_scratch_device directly and when using a large filesystem this needs to run with a -t option to avoid consuming large amounts of memory. Make this happen in all cases that the scratch device is checked. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Rich Johnston <rjohnston@sgi.com> Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
committed by
Rich Johnston
parent
5635b681d4
commit
549ec4ae72
@@ -48,9 +48,6 @@ _supported_os Linux
|
||||
|
||||
_require_scratch
|
||||
|
||||
checkopts=""
|
||||
[ "$USE_BIG_LOOPFS" = yes ] && checkopts=-t
|
||||
|
||||
echo "*** init FS"
|
||||
|
||||
rm -f $seq.full
|
||||
@@ -82,8 +79,8 @@ do
|
||||
echo "" >>$seq.full
|
||||
echo "*** XFS_CHECK ***" >>$seq.full
|
||||
echo "" >>$seq.full
|
||||
_scratch_xfs_check $checkopts >>$seq.full 2>&1 \
|
||||
|| _fail "xfs_check $checkopts failed"
|
||||
_scratch_xfs_check >>$seq.full 2>&1 \
|
||||
|| _fail "xfs_check failed"
|
||||
_scratch_mount -o remount,rw \
|
||||
|| _fail "remount rw failed"
|
||||
done
|
||||
|
||||
@@ -475,6 +475,8 @@ _scratch_xfs_check()
|
||||
SCRATCH_OPTIONS=""
|
||||
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
|
||||
SCRATCH_OPTIONS="-l $SCRATCH_LOGDEV"
|
||||
[ "$LARGE_SCRATCH_DEV" = yes ] && \
|
||||
SCRATCH_OPTIONS=$SCRATCH_OPTIONS" -t"
|
||||
$XFS_CHECK_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user