On Fri, May 15, 2015 at 02:36:44PM +0100, Andrew Price wrote: > 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> .... > 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" This belongs in scratch_mkfs_sized(), as gfs2 specific code. You have the size of the fs to be made there, so set the limit appropriately there. As it is, it's worth considering that this is exposing a mkfs.gfs2 bug in that it doesn't handle small filesystem sizes correctly by default.... Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx -- 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
