From b2de346746bbc822ebb0c30213f7fb767cfc0dc4 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Sat, 6 Mar 2010 11:24:38 +1100 Subject: [PATCH] xfsqa: fix size specification for scratch mkfs When making a specifically sized scratch filesystem, we need to calculate the size rather than assigning the caclculation expression to a variable and passing that into the _scratch_mkfs_sized function. Currently sized filesystems are failing to be made and the code is falling back to full sized filesystems so we are not testing enospc issues correctly. Signed-off-by: Dave Chinner --- 077 | 2 +- 204 | 2 +- common.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/077 b/077 index 72f1b2aa..4e12163c 100755 --- a/077 +++ b/077 @@ -62,7 +62,7 @@ rm -f $seq.full umount $SCRATCH_DEV >/dev/null 2>&1 echo "*** MKFS ***" >>$seq.full echo "" >>$seq.full -let SIZE=50*1024*1024 +SIZE=`expr 50 \* 1024 \* 1024` _scratch_mkfs_sized $SIZE >>$seq.full 2>&1 \ || _fail "mkfs failed" _scratch_mount >>$seq.full 2>&1 \ diff --git a/204 b/204 index 14ebcdc8..8b94f608 100755 --- a/204 +++ b/204 @@ -40,7 +40,7 @@ _supported_os Linux _require_scratch -SIZE=104*1024*1024 +SIZE=`expr 104 \* 1024 \* 1024` _scratch_mkfs_sized $SIZE &> /dev/null _scratch_mount diff --git a/common.rc b/common.rc index ca2cd2cb..d71e0a2d 100644 --- a/common.rc +++ b/common.rc @@ -320,7 +320,7 @@ _scratch_mkfs_sized() fssize=$1 blocksize=$2 [ -z "$blocksize" ] && blocksize=4096 - let blocks=$fssize/$blocksize + blocks=`expr $fssize / $blocksize` case $FSTYP in xfs) -- 2.39.5