btrfs: update golden output of RST test cases

Starting with kernel patch "btrfs: remove raid-stripe-tree
encoding field from stripe_extent" and btrfs-progs commit
7c549b5f7cc0 ("btrfs-progs: remove raid stripe encoding"), the on-disk
format of the raid stripe tree got changed.

As the feature is still experimental and not to be used in production, it
is OK to do a on-disk format change.

Update the golden output of the RAID stripe tree test cases after the
on-disk format and print format changes.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>

diff --git a/tests/btrfs/304.out b/tests/btrfs/304.out
index e5e383e7024839de22497dc285ff66f000eb2d9e..56059fab27510472d7d22e6dedc6a16b96b883f9 100644 (file)
--- a/tests/btrfs/304.out
+++ b/tests/btrfs/304.out
@@ -10,8 +10,7 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -26,8 +25,7 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -43,8 +41,7 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX

diff --git a/tests/btrfs/305.out b/tests/btrfs/305.out
index 90eeb634197eb8445c6d3b784f0efb4644ee603a..07e58f460ba140aef49dacb1d377f972c0ab897b 100644 (file)
--- a/tests/btrfs/305.out
+++ b/tests/btrfs/305.out
@@ -12,14 +12,11 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -36,12 +33,10 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -59,16 +54,13 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX

diff --git a/tests/btrfs/306.out b/tests/btrfs/306.out
index efe7f903a1f22197a6d9d99833e114309928d93a..cd843cdb38df20abfb7a7472366b3b8f3b532b52 100644 (file)
--- a/tests/btrfs/306.out
+++ b/tests/btrfs/306.out
@@ -12,11 +12,9 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -33,12 +31,10 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -56,12 +52,10 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX

diff --git a/tests/btrfs/307.out b/tests/btrfs/307.out
index 13ce8fcb624377657220c8768e81dbe5cbf15ba9..243f4d0e0f1dc099da68deb2f3dbc3d23dd7fe49 100644 (file)
--- a/tests/btrfs/307.out
+++ b/tests/btrfs/307.out
@@ -10,11 +10,9 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -29,8 +27,7 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -46,12 +43,10 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX

diff --git a/tests/btrfs/308.out b/tests/btrfs/308.out
index 21a623c1edef375ed8b37f75bfca02e4b9776a81..499101c8fac3a3febb17aa7e3f40d3273bb8d288 100644 (file)
--- a/tests/btrfs/308.out
+++ b/tests/btrfs/308.out
@@ -14,20 +14,15 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
-       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -46,16 +41,13 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -75,24 +67,19 @@ leaf XXXXXXXXX items X free space XXXXX generation X owner RAID_STRIPE_TREE
 leaf XXXXXXXXX flags 0x1(WRITTEN) backref revision 1
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
-       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX