Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+8 -2
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 072
# FS QA Test No. 072
#
# Check some unwritten extent boundary conditions
#
@@ -43,8 +43,9 @@ echo "QA output created by $seq"
_cleanup()
{
umount $SCRATCH_MNT 2>/dev/null
cd /
rm -f $tmp.*
umount $SCRATCH_MNT 2>/dev/null
}
here=`pwd`
@@ -57,6 +58,11 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
[ -x /usr/sbin/xfs_io ] || _notrun "xfs_io executable not found"
_require_scratch
rm -f $seq.full