updates for supporting blocksizes smaller than the pagesize.

diff --git a/018 b/018
index a700d42a1e6e3957f4c81c268ba662adb2a437f9..b8e5564c1e4fb128daa46be344c9caa166e2c1dd 100755 (executable)
--- a/018
+++ b/018
@@ -52,6 +52,7 @@ status=0      # success is the default!
 
 _cleanup()
 {
+    rm -f $tmp.*
     echo "*** unmount"
     umount $SCRATCH_MNT 2>/dev/null
 }
@@ -98,7 +99,6 @@ _filter_logprint()
         s/1st: *[0-9][0-9]*  *last: *[0-9][0-9]*  *cnt: *[0-9][0-9]*  *freeblks: *[0-9][0-9]*  *longest: *[0-9][0-9]*/1st:<NUM> last:<NUM> cnt:<COUNT> freeblks:<COUNT> longest:<NUM>/;
         s/^uuid: *[0-9a-f-][0-9a-f-]* *format: *.*$/uuid: <UUID> format: <FORMAT>/;
     '
-
 }
 
 _check_log()
@@ -118,14 +118,19 @@ _require_scratch
 
 echo "*** init FS"
 
-rm -f $seq.out $seq.full
+touch $seq.out
 umount $SCRATCH_DEV >/dev/null 2>&1
 
 _full "mkfs"
-mkfs_xfs -lsize=2000b $SCRATCH_DEV    >>$seq.full 2>&1 \
-    || _fail "mkfs failed"
+mkfs_xfs -lsize=2000b $SCRATCH_DEV | _filter_mkfs 2>$tmp.mkfs
+source $tmp.mkfs
+[ $dbsize -eq 4096 ] \
+    || _notrun "Log print test tailored to 4K blocks (currently using $dbsize)"
+
+rm -f $seq.out $seq.full
+
 _full " mount"
-mount -t xfs $SCRATCH_DEV $SCRATCH_MNT      >>$seq.full 2>&1 \
+mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full 2>&1 \
     || _fail "mount failed"
 
 _setup_seq_out

diff --git a/018.grpquota b/018.grpquota
index 424f3a2203c7e3c588ad6ca6efee9cc71b33d4ab..82ba340df11ce6d0a96899b8c46889023981d2a2 100755 (executable)
--- a/018.grpquota
+++ b/018.grpquota
@@ -1,5 +1,11 @@
 QA output created by 018
 *** init FS
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 ### xfs_logprint output ###
 xfs_logprint:
     data device: <DEVICE>

diff --git a/018.noquota b/018.noquota
index 1e7547bbefac6c19763bf6a0f7c90b6b876c2744..5f433ea772d35fc2cb2932edfd6a5edc7e2b1f45 100755 (executable)
--- a/018.noquota
+++ b/018.noquota
@@ -1,5 +1,11 @@
 QA output created by 018
 *** init FS
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 ### xfs_logprint output ###
 xfs_logprint:
     data device: <DEVICE>

diff --git a/018.ugquota b/018.ugquota
index 9d589c9807b73dad066c4ca056f78821b9073093..39b406e29270021021a41b6de7f5549c039591d9 100755 (executable)
--- a/018.ugquota
+++ b/018.ugquota
@@ -1,5 +1,11 @@
 QA output created by 018
 *** init FS
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 ### xfs_logprint output ###
 xfs_logprint:
     data device: <DEVICE>

diff --git a/018.usrquota b/018.usrquota
index fb5af8b9006f8dbd862a66497915f363c3f1dedc..d0fe8c96969c382c5d6244ce996bdf58d6dd3bda 100755 (executable)
--- a/018.usrquota
+++ b/018.usrquota
@@ -1,5 +1,11 @@
 QA output created by 018
 *** init FS
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 ### xfs_logprint output ###
 xfs_logprint:
     data device: <DEVICE>

diff --git a/check b/check
index 926000a86c257a58027012b6f5683fbb5661951d..b96115da00c6f5040e0ccf7aa67c2d160c804b66 100755 (executable)
--- a/check
+++ b/check
@@ -158,7 +158,7 @@ timestamp=false
 
 if [ ! -z "$MKFS_OPTIONS" ]
 then
-    echo "check: \$MKFS_OPTIONS specified - \"$MKFS_OPTIONS\""
+    echo "check: \$MKFS_OPTIONS specified -- \"$MKFS_OPTIONS\""
     umount $SCRATCH_DEV 2>/dev/null
     # call the overridden mkfs.xfs - make sure the FS is built
     # the same as we'll create it later.
@@ -173,7 +173,7 @@ fi
 
 if [ ! -z "$MOUNT_OPTIONS" ]
 then
-    echo "check: \$MOUNT_OPTIONS specified - \"$MOUNT_OPTIONS\""
+    echo "check: \$MOUNT_OPTIONS specified -- \"$MOUNT_OPTIONS\""
     umount $TEST_DEV
     # call the overridden mount - make sure the FS starts as
     # the same as we'll set it later.