[PATCH 03/10] xfstests: _scratch_mkfs_sized() for tmpfs

Junho Ryu
2013-12-10T20:12:19Z

From: Hugh Dickins <hughd@google.com>

_scratch_mkfs_sized() avoid blockdev and update MOUNT_OPTIONS with
required size on tmpfs, so those tests using it can now run.

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Junho Ryu <jayr@google.com>
---
common/rc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index a2005c9..83d56a1 100644
--- a/common/rc
+++ b/common/rc
@@ -590,7 +590,7 @@ _scratch_mkfs_sized()

blocks=`expr $fssize / $blocksize`

- if [ "$HOSTOS" == "Linux" ]; then
+ if [ "$HOSTOS" == "Linux" -a "$FSTYP" != "tmpfs" ]; then
devsize=`blockdev --getsize64 $SCRATCH_DEV`
[ "$fssize" -gt "$devsize" ] && _notrun "Scratch device too small"
fi
@@ -611,6 +611,9 @@ _scratch_mkfs_sized()
btrfs)
$MKFS_BTRFS_PROG $MKFS_OPTIONS -b $fssize $SCRATCH_DEV
;;
+ tmpfs)
+ export MOUNT_OPTIONS="-o size=$fssize $TMPFS_MOUNT_OPTIONS"
+ ;;
*)
_notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
;;
--
1.8.5.1