On Tue, Feb 09, 2016 at 08:49:51PM -0500, Theodore Ts'o wrote: > From: Hugh Dickins <hughd@xxxxxxxxxx> > > _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@xxxxxxxxxx> > Signed-off-by: Junho Ryu <jayr@xxxxxxxxxx> > Signed-off-by: Theodore Ts'o <tytso@xxxxxxx> > --- > common/rc | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/common/rc b/common/rc > index 76e02e4..aca723f 100644 > --- a/common/rc > +++ b/common/rc > @@ -813,7 +813,7 @@ _scratch_mkfs_sized() > > blocks=`expr $fssize / $blocksize` > > - if [ "$HOSTOS" == "Linux" ]; then > + if [ "$HOSTOS" == "Linux" -a -b "$SCRATCH_DEV" ]; then > devsize=`blockdev --getsize64 $SCRATCH_DEV` > [ "$fssize" -gt "$devsize" ] && _notrun "Scratch device too small" > fi > @@ -849,6 +849,9 @@ _scratch_mkfs_sized() > sector_size=`blockdev --getss $SCRATCH_DEV` > $MKFS_F2FS_PROG $MKFS_OPTIONS $SCRATCH_DEV `expr $fssize / $sector_size` > ;; > + tmpfs) > + export MOUNT_OPTIONS="-o size=$fssize $TMPFS_MOUNT_OPTIONS" So what happens when the test asks for 10GB of device space, and you only have 4GB of RAM? 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
