Make test 018 work when underlying volume provides stripe alignment info to mkfs.

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

diff --git a/018 b/018
index 874bd109f9a9a638cd7d710ee285cc3592709019..5565675c193989d741f2cae2dda434ef5041f92c 100755 (executable)
--- a/018
+++ b/018
@@ -37,7 +37,7 @@ _supported_os IRIX Linux
 # prelim
 rm -f $seq.full $tmp.*
 _require_scratch
-_require_v2log 
+_require_v2log
 
 # link correct .out file
 _link_out_file $seq.op
@@ -55,7 +55,7 @@ cat >$tmp.seq.params <<EOF
   version=2     logbsize=256k
 EOF
 
-if [ "$HOSTOS" = "IRIX" ]; then 
+if [ "$HOSTOS" = "IRIX" ]; then
     start_blk=0
 else
     start_blk=2
@@ -66,10 +66,10 @@ fi
 cat $tmp.seq.params \
 | while read mkfs mnt
 do
-    if [ "$mkfs" = "#" ]; then 
+    if [ "$mkfs" = "#" ]; then
        continue
     fi
-    export MKFS_OPTIONS="-l $mkfs"
+    export MKFS_OPTIONS="-d noalign -l $mkfs"
     export MOUNT_OPTIONS="-o $mnt"
     _mkfs_log
     _create_log

diff --git a/018.out b/018.out
index 130c466eaa06a426465da8c8fe09e843afdc7b18..5b2c2853f90024612eafe4bc02f11f66fec9e8b1 100644 (file)
--- a/018.out
+++ b/018.out
@@ -1,17 +1,17 @@
 QA output created by 018
 *** init FS
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=1.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=1.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=1.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=64k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=64k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=64k.mkfs-lversion=2.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=128k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=128k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=128k.mkfs-lversion=2.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=256k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=256k.mkfs-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=256k.mkfs-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered