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
+14 -5
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 078
# FS QA Test No. 078
#
# Check several growfs corner cases
#
@@ -45,12 +45,21 @@ here=`pwd`
tmp=/tmp/$$
status=1
trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
_cleanup()
{
umount $LOOP_MNT 2>/dev/null
rmdir $LOOP_MNT
cd /
rm -f $tmp.*
umount $LOOP_MNT 2>/dev/null
rmdir $LOOP_MNT
_cleanup_testdir
}
trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -95,7 +104,7 @@ _grow_loop()
echo "*** unmount and check"
umount $LOOP_MNT
_check_filesystem $LOOP_DEV
_check_xfs_filesystem $LOOP_DEV
rm -f $LOOP_DEV
}