@@ -938,6 +938,8 @@ _supported_os()
#
_require_scratch()
{
+ local i
+
case "$FSTYP" in
nfs*)
echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
@@ -978,6 +980,17 @@ _require_scratch()
exit 1
fi
fi
+
+ # we may have a scratch dev pool specified, so make sure it's been unmounted
+ # from the scratch mount
+ for i in $SCRATCH_DEV_POOL; do
+ if _mount | grep $i | grep -q $SCRATCH_MNT; then
+ if ! $UMOUNT_PROG $i; then
+ echo "failed to umount $i - aborting"
+ exit 1
+ fi
+ fi
+ done
}
# this test needs a logdev
If you use the SCRATCH_DEV_POOL for btrfs you will end up with the command line like this mkfs.btrfs $SCRATCH_DEV_POOL $SCRATCH_DEV and btrfs does this thing where it makes the lowest valued device id show up in /proc/mounts no matter which device you specify at the mount command. So in this case mount will show the first device in $SCRATCH_DEV_POOL instead of $SCRATCH_DEV, so anybody who wants to just use the scratch mnt with the scratch dev will fail to work because we never unmount the scratch mount. Fix this by checking to see if the scratch dev pool is mounted at scratch mnt and unmount it so we can run our test. This fixes the issue I was seeing by running ./check btrfs/307 generic/015 Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> --- common/rc | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)