This enables tests which use _scratch_mkfs_sized when $FSTYP == gfs2.
Where tests use a fs size too small to contain a gfs2 fs created with
default options, specify a smaller journal size to make it fit.
Signed-off-by: Andrew Price <anprice@xxxxxxxxxx>
---
common/config | 1 +
common/rc | 5 ++++-
tests/generic/015 | 3 +++
tests/generic/083 | 3 +++
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/common/config b/common/config
index 3732287..2454418 100644
--- a/common/config
+++ b/common/config
@@ -228,6 +228,7 @@ case "$HOSTOS" in
export MKFS_NFS_PROG="false"
export MKFS_CIFS_PROG="false"
export MKFS_REISER4_PROG="`set_prog_path mkfs.reiser4`"
+ export MKFS_GFS2_PROG="`set_prog_path mkfs.gfs2`"
;;
esac
diff --git a/common/rc b/common/rc
index 6ea107e..a269c2b 100644
--- a/common/rc
+++ b/common/rc
@@ -652,7 +652,7 @@ _scratch_mkfs_sized()
xfs)
def_blksz=`echo $MKFS_OPTIONS|sed -rn 's/.*-b ?size= ?+([0-9]+).*/\1/p'`
;;
- ext2|ext3|ext4|ext4dev|udf|btrfs|reiser4)
+ ext2|ext3|ext4|ext4dev|udf|btrfs|reiser4|gfs2)
def_blksz=`echo $MKFS_OPTIONS| sed -rn 's/.*-b ?+([0-9]+).*/\1/p'`
;;
esac
@@ -700,6 +700,9 @@ _scratch_mkfs_sized()
$MKFS_REISER4_PROG $MKFS_OPTIONS -y -b $blocksize $SCRATCH_DEV \
`expr $fssize / 1024`
;;
+ gfs2)
+ $MKFS_GFS2_PROG $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
+ ;;
*)
_notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
;;
diff --git a/tests/generic/015 b/tests/generic/015
index 8d3fd5f..d1805a7 100755
--- a/tests/generic/015
+++ b/tests/generic/015
@@ -53,6 +53,9 @@ _supported_os IRIX Linux
_require_scratch
_require_no_large_scratch_dev
+# GFS2 needs a smaller journal size to fit in 50M
+[ $FSTYP = "gfs2" ] && MKFS_OPTIONS="$MKFS_OPTIONS -J16"
+
_scratch_mkfs_sized `expr 50 \* 1024 \* 1024` >/dev/null 2>&1 \
|| _fail "mkfs failed"
_scratch_mount || _fail "mount failed"
diff --git a/tests/generic/083 b/tests/generic/083
index 61316bf..4e38f81 100755
--- a/tests/generic/083
+++ b/tests/generic/083
@@ -88,6 +88,9 @@ workout()
echo "*** test out-of-space handling for random write operations"
+# GFS2 needs a smaller journal size to fit in 100M
+[ $FSTYP = "gfs2" ] && MKFS_OPTIONS="$MKFS_OPTIONS -J64"
+
filesize=`expr 100 \* 1024 \* 1024`
agcount=6
numprocs=15
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
