This is just a simple patch to get the tmpfs working. I've made the full xfstests run with the tmpfs as the target filesystem and it works quite well. Some tests passed properly, some tests failed (and some of them due to the nature of tmpfs).
I didn't change the xfstests logic to recognize a proper SCRATCH_DEV so the SCRATCH_DEV for tmpfs should be in the nfs form (with the : in it) for this to work properly.
diff --git a/common b/common
index 0723224..5853602 100644
--- a/common
+++ b/common
@@ -126,6 +126,7 @@ check options
-xfs test XFS (default)
-udf test UDF
-nfs test NFS
+ -tmpfs test TMPFS
-l line mode diff
-xdiff graphical mode diff
-udiff show unified diff (default)
@@ -158,6 +159,11 @@ testlist options
xpand=false
;;
+ -tmpfs) # -tmpfs ... set FSTYP to tmpfs
+ FSTYP=tmpfs
+ xpand=false
+ ;;
+
-g) # -g group ... pick from group file
group=true
xpand=false
diff --git a/common.rc b/common.rc
index 602513a..a1351c9 100644
--- a/common.rc
+++ b/common.rc
@@ -97,6 +97,10 @@ _mount_opts()
# acls aren't turned on by default on gfs2
export MOUNT_OPTIONS="-o acl $GFS2_MOUNT_OPTIONS"
;;
+ tmpfs)
+ # We need to specify the size at mount, use 512 MB by default
+ export MOUNT_OPTIONS="-o size=512M $TMPFS_MOUNT_OPTIONS"
+ ;;
*)
;;
esac
@@ -116,6 +120,9 @@ _mkfs_opts()
nfs)
export MKFS_OPTIONS=$NFS_MKFS_OPTIONS
;;
+ tmpfs)
+ export MKFS_OPTIONS=$TMPFS_MKFS_OPTIONS
+ ;;
reiserfs)
export MKFS_OPTIONS="$REISERFS_MKFS_OPTIONS -q"
;;
@@ -327,6 +334,9 @@ _scratch_mkfs()
nfs*)
# do nothing for nfs
;;
+ tmpfs)
+ # do nothing for tmpfs
+ ;;
udf)
$MKFS_UDF_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
;;
@@ -736,6 +746,12 @@ _require_scratch()
_notrun "this test requires a valid \$SCRATCH_DEV"
fi
;;
+ tmpfs)
+ if [ -z "$SCRATCH_DEV" -o ! -d "$SCRATCH_MNT" ];
+ then
+ _notrun "this test requires a valid \$SCRATCH_MNT and unique $SCRATCH_DEV"
+ fi
+ ;;
*)
if [ -z "$SCRATCH_DEV" -o "`_is_block_dev $SCRATCH_DEV`" = "" ]
then
@@ -1394,6 +1410,9 @@ _check_test_fs()
nfs)
# no way to check consistency for nfs
;;
+ tmpfs)
+ # no way to check the consistency for tmpfs
+ ;;
udf)
# do nothing for now
;;
@@ -1426,6 +1445,9 @@ _check_scratch_fs()
nfs*)
# Don't know how to check an NFS filesystem, yet.
;;
+ tmpfs)
+ # No way to check the consistency of tmpfs
+ ;;
btrfs)
_check_btrfs_filesystem $SCRATCH_DEV
;;
@@ -1517,6 +1539,33 @@ _setup_nfs_scratchdir()
testdir=$SCRATCH_MNT
}
+_setup_tmpfs_scratchdir()
+{
+ [ "$FSTYP" != "tmpfs" ] \
+ && _fail "setup_tmpfs_testdir: \$FSTYP is not tmpfs"
+ [ -z "$SCRATCH_DEV" ] \
+ && _notrun "this test requires a valid host fs for \$SCRATCH_DEV"
+ [ -z "$SCRATCH_MNT" ] \
+ && _notrun "this test requires a valid \$SCRATCH_MNT"
+
+ # mounted?
+ if _mount | grep -q $SCRATCH_DEV
+ then
+ # if it's mounted, make sure its on $SCRATCH_MNT
+ if ! _mount | grep $SCRATCH_DEV | grep -q $SCRATCH_MNT
+ then
+ _fail "\$SCRATCH_DEV is mounted but not on \$SCRATCH_MNT - aborting"
+ fi
+ $UMOUNT_PROG $SCRATCH_DEV
+ fi
+
+ _scratch_mkfs
+ _scratch_mount
+
+ testdir=$SCRATCH_MNT
+}
+
+
#
# Warning for UDF and NFS:
# this function calls _setup_udf_scratchdir and _setup_udf_scratchdir
@@ -1535,6 +1584,9 @@ _setup_testdir()
nfs*)
_setup_nfs_scratchdir
;;
+ tmpfs)
+ _setup_tmpfs_scratchdir
+ ;;
*)
testdir=$TEST_DIR
;;
@@ -1552,6 +1604,10 @@ _cleanup_testdir()
# umount testdir as it is $SCRATCH_MNT which could be used by xfs next
[ -n "$testdir" ] && $UMOUNT_PROG $testdir
;;
+ tmpfs)
+ # umount testdir since it is actually a scrath mount
+ [ -n "$testdir" ] && $UMOUNT_PROG $testdir
+ ;;
*)
# do nothing, testdir is $TEST_DIR
:
Signed-off-by: Boris Ranto <ranto.boris@gmail.com>
_______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
