Drop 113 from auto group until AIO issue resolved, add missed quota test update.

Merge of master-melb:xfs-cmds:22100a by kenmcd.

diff --git a/common.config b/common.config
index 192a8b3254c8fe96a03a49957b3268893c64fdee..6f9d08fb4b8a67b251a120fe05971f234c29ba09 100644 (file)
--- a/common.config
+++ b/common.config
@@ -187,6 +187,7 @@ known_hosts()
                EMAIL="nathans@larry"
                SCRATCH_MNT=/mnt/xfs0
                SCRATCH_DEV=/dev/sdb5
+               #SCRATCH_RTDEV=/dev/sdc1
                #SCRATCH_RTDEV=/dev/md0
                SCRATCH_LOGDEV=/dev/sda11
                TEST_DIR=/mnt/xfs1

diff --git a/common.quota b/common.quota
index 7f9a2a2b66bf8b373d6a375beff5e0c739788841..4f82546ae53165e711999bc3d8bd07e5dcfa6f63 100644 (file)
--- a/common.quota
+++ b/common.quota
@@ -125,6 +125,33 @@ _qmount()
     [ -x /usr/sbin/quot ] && quot $SCRATCH_MNT >>$seq.full 2>&1
 }
 
+_qsetup()
+{
+    # setup exactly what it is we'll be testing
+    enforce=1
+    if src/feature -u $SCRATCH_DEV
+    then
+       type=u ; eval `_choose_uid`; ln -s $seq.usrquota $seq.out
+    elif src/feature -g $SCRATCH_DEV
+    then
+       type=g ; eval `_choose_gid`; ln -s $seq.grpquota $seq.out
+    elif src/feature -U $SCRATCH_DEV
+    then
+       type=u ; eval `_choose_uid`; ln -s $seq.uqnoenforce $seq.out
+       enforce=0
+    elif src/feature -G $SCRATCH_DEV
+    then
+       type=g ; eval `_choose_gid`; ln -s $seq.gqnoenforce $seq.out
+       enforce=0
+    else
+       _notrun "No quota support at mount time"
+    fi
+
+    echo "Using output from '" `ls -l $seq.out` "'" >>$seq.full
+    echo "and using type=$type id=$id" >>$seq.full
+}
+
+
 #-----------------------------------------------------------------------------------
 #
 # wrappers for Linux/IRIX differences

diff --git a/group b/group
index 959f2d32b27c4f7c9262dffd977a1e9ea4e03e3f..4f846bf7b8db210ba9dcfeb7c0c0bdcfa313d2aa 100644 (file)
--- a/group
+++ b/group
@@ -183,4 +183,4 @@ aio         nathans@sgi.com
 104 growfs ioctl
 105 acl auto
 112 rw aio auto
-113 rw aio auto
+113 rw aio