From: Johannes Thumshirn Date: Mon, 1 Jul 2024 08:01:09 +0000 (+0200) Subject: btrfs: update golden output of RST test cases X-Git-Tag: v2024.07.14~4 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f2e4254101b93718a6df0188313e9f73b0df0b4;p=xfstests-dev.git 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 Reviewed-by: Filipe Manana Reviewed-by: Qu Wenruo Reviewed-by: Anand Jain Signed-off-by: Anand Jain --- diff --git a/tests/btrfs/304.out b/tests/btrfs/304.out index e5e383e7..56059fab 100644 --- 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 chunk 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 chunk 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 chunk 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 90eeb634..07e58f46 100644 --- 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 chunk 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 chunk 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 chunk 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 efe7f903..cd843cdb 100644 --- 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 chunk 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 chunk 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 chunk 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 13ce8fcb..243f4d0e 100644 --- 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 chunk 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 chunk 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 chunk 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 21a623c1..499101c8 100644 --- 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 chunk 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 chunk 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 chunk 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