Work to get QA to run successfully on filesystems with non-default inode sizes.

diff --git a/018 b/018
index 30c4c6bcdb1081360a33825d8b963578db86fda7..175168158ea190f32f208ac09381dfc7ada0d3d1 100755 (executable)
--- a/018
+++ b/018
@@ -126,6 +126,8 @@ mkfs_xfs -lsize=2000b $SCRATCH_DEV | _filter_mkfs 2>$tmp.mkfs
 source $tmp.mkfs
 [ $dbsize -eq 4096 ] \
     || _notrun "Logprint test, tailored to 4K blocks ($dbsize in use)"
 source $tmp.mkfs
 [ $dbsize -eq 4096 ] \
     || _notrun "Logprint test, tailored to 4K blocks ($dbsize in use)"

+[ $isize -eq 256 ] \
+    || _notrun "Logprint test, tailored to 256b inodes ($isize in use)"

 [ $lversion -eq 1 ]  \
     || _notrun "Logprint test, tailored to v1 log format (v$lversion in use)"
 
 [ $lversion -eq 1 ]  \
     || _notrun "Logprint test, tailored to v1 log format (v$lversion in use)"
 

diff --git a/033 b/033
index e90a1a565188428c2d5356ceece6063b54a30432..cfc2f6f34de0d2ab154cac01a9764107e504273b 100755 (executable)
--- a/033
+++ b/033
@@ -74,8 +74,12 @@ _check_root_inos()
 # real QA test starts here
 _require_scratch
 
 # real QA test starts here
 _require_scratch
 

-# devzero blows away 512byte blocks, so make 512byte inodes
-mkfs_xfs -isize=512 $SCRATCH_DEV | _filter_mkfs 2>/dev/null
+# devzero blows away 512byte blocks, so make 512byte inodes (at least)
+mkfs_xfs $SCRATCH_DEV | _filter_mkfs 2>$tmp.mkfs
+source $tmp.mkfs
+[ $isize -lt 512 ] && \
+       mkfs_xfs -isize=512 $SCRATCH_DEV | _filter_mkfs 2>/dev/null
+

 `xfs_db -r -c sb -c p $SCRATCH_DEV | grep 'ino = ' | \
        sed -e 's/ //g' -e 's/^/export /'`
 
 `xfs_db -r -c sb -c p $SCRATCH_DEV | grep 'ino = ' | \
        sed -e 's/ //g' -e 's/^/export /'`
 

diff --git a/033.out b/033.out
index 00244ee05ec45f880efee2658f46f6c08599a607..93fb00c534f12ddb7e35af1af8b04d7261076dbf 100644 (file)
--- a/033.out
+++ b/033.out
@@ -6,7 +6,7 @@ naming   =VERN bsize=XXX
 log      =LDEV bsize=XXX blocks=XXX
 realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 Corrupting root inode - setting bits to 0
 log      =LDEV bsize=XXX blocks=XXX
 realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 Corrupting root inode - setting bits to 0

-Wrote 0.50Kb (value 0x0)
+Wrote X.XXKb (value 0x0)

 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...
 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...


@@ -42,7 +42,7 @@ Phase 7 - verify and correct link counts...
 resetting inode INO nlinks from 2 to 3
 done
 Corrupting rt bitmap inode - setting bits to 0
 resetting inode INO nlinks from 2 to 3
 done
 Corrupting rt bitmap inode - setting bits to 0

-Wrote 0.50Kb (value 0x0)
+Wrote X.XXKb (value 0x0)

 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...
 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...


@@ -78,7 +78,7 @@ reinitializing realtime bitmap inode
 Phase 7 - verify and correct link counts...
 done
 Corrupting rt summary inode - setting bits to 0
 Phase 7 - verify and correct link counts...
 done
 Corrupting rt summary inode - setting bits to 0

-Wrote 0.50Kb (value 0x0)
+Wrote X.XXKb (value 0x0)

 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...
 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...


@@ -114,7 +114,7 @@ reinitializing realtime summary inode
 Phase 7 - verify and correct link counts...
 done
 Corrupting root inode - setting bits to -1
 Phase 7 - verify and correct link counts...
 done
 Corrupting root inode - setting bits to -1

-Wrote 0.50Kb (value 0xffffffff)
+Wrote X.XXKb (value 0xffffffff)

 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...
 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...


@@ -152,7 +152,7 @@ Phase 7 - verify and correct link counts...
 resetting inode INO nlinks from 2 to 3
 done
 Corrupting rt bitmap inode - setting bits to -1
 resetting inode INO nlinks from 2 to 3
 done
 Corrupting rt bitmap inode - setting bits to -1

-Wrote 0.50Kb (value 0xffffffff)
+Wrote X.XXKb (value 0xffffffff)

 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...
 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...


@@ -190,7 +190,7 @@ disconnected dir inode INO, moving to lost+found
 Phase 7 - verify and correct link counts...
 done
 Corrupting rt summary inode - setting bits to -1
 Phase 7 - verify and correct link counts...
 done
 Corrupting rt summary inode - setting bits to -1

-Wrote 0.50Kb (value 0xffffffff)
+Wrote X.XXKb (value 0xffffffff)

 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...
 Phase 1 - find and verify superblock...
 Phase 2 - using internal log
         - zero log...

diff --git a/common.repair b/common.repair
index 3d84c2980ca106ed681db57f270647150b50e27c..1e9a22a70d7d36689c3f1148d28c215bc03b8c80 100644 (file)
--- a/common.repair
+++ b/common.repair
@@ -49,7 +49,8 @@ _zero_position()
                exit
        fi
        length=`expr $length / 512`
                exit
        fi
        length=`expr $length / 512`

-       src/devzero -v $value -b 1 -n $length -o $offset $SCRATCH_DEV
+       src/devzero -v $value -b 1 -n $length -o $offset $SCRATCH_DEV \
+               | perl -npe 's/\d\.\d\dKb/X.XXKb/g'

 }
 
 _filter_repair()
 }
 
 _filter_repair()