filter out log device

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

  filter out log device

diff --git a/096 b/096
index 53a9032f5170517abce73e57399d34cff7255106..45f393732f2a271505469522e289103ccef9270b 100755 (executable)
--- a/096
+++ b/096
@@ -68,6 +68,15 @@ _cleanup()
 #   - inode-paths on IRIX
 #   - trailing spaces on Linux but not on IRIX
 #
+# Example output:
+#  meta-data=DEV isize=256    agcount=N, agsize=N blks
+#  data     =                       bsize=4096   blocks=N, imaxpct=25
+#           =                       sunit=65     swidth=65 blks, unwritten=1
+#  naming   =version 2              bsize=4096
+#  log      =internal log           bsize=4096   blocks=N, version=1
+#           =                       sunit=0 blks
+#  realtime =none                   extsz=65536  blocks=N, rtextents=0
+# 
 _mkfs_filter()
 {
    tee -a $seq.full | \
@@ -83,6 +92,7 @@ _mkfs_filter()
        -e 's/sectsz=[0-9][0-9]* *//' \
        -e 's/, lazy-count.*//' \
        -e '/inode-paths/d' \
+       -e 's/\(log[    ]*=\).*bsize/\1LOG                    bsize/' \
        -e 's/ *$//'
 }
 

diff --git a/096.out b/096.out
index 943ac53264f39c2ea499e6dd49b5b97f444a176e..5d091feebac7f2765789d68b7598f07fe03100a5 100644 (file)
--- a/096.out
+++ b/096.out
@@ -13,7 +13,7 @@ meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=0      swidth=0 blks, unwritten=1
 naming   =version 2              bsize=4096
-log      =internal log           bsize=4096   blocks=N, version=2
+log      =LOG                    bsize=4096   blocks=N, version=2
          =                       sunit=8 blks
 realtime =none                   extsz=65536  blocks=N, rtextents=0
 
@@ -26,7 +26,7 @@ meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=65     swidth=65 blks, unwritten=1
 naming   =version 2              bsize=4096
-log      =internal log           bsize=4096   blocks=N, version=2
+log      =LOG                    bsize=4096   blocks=N, version=2
          =                       sunit=8 blks
 realtime =none                   extsz=65536  blocks=N, rtextents=0
 
@@ -37,7 +37,7 @@ meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=65     swidth=65 blks, unwritten=1
 naming   =version 2              bsize=4096
-log      =internal log           bsize=4096   blocks=N, version=1
+log      =LOG                    bsize=4096   blocks=N, version=1
          =                       sunit=0 blks
 realtime =none                   extsz=65536  blocks=N, rtextents=0
 
@@ -48,7 +48,7 @@ meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=65     swidth=65 blks, unwritten=1
 naming   =version 2              bsize=4096
-log      =internal log           bsize=4096   blocks=N, version=1
+log      =LOG                    bsize=4096   blocks=N, version=1
          =                       sunit=0 blks
 realtime =none                   extsz=65536  blocks=N, rtextents=0