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
+6 -2
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 077
# FS QA Test No. 077
#
# Check use of ACLs (extended attributes) on a full filesystem
#
@@ -44,10 +44,12 @@ echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
status=1
filler=$here/../../linux
#filler=$here/../../linux
filler=/home/fsgqa/isms/2.4.x-xfs
_cleanup()
{
cd /
echo "*** unmount"
umount $SCRATCH_MNT 2>/dev/null
}
@@ -58,6 +60,8 @@ trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.filter
# real QA test starts here
_supported_fs xfs
_supported_os Linux
[ ! -d $filler ] && _notrun "No linux directory to source files from"