[v2] btrfs: update golden output of RST test cases

Message ID	20240701080109.20673-1-jth@kernel.org (mailing list archive)
State	New, archived
Headers	show Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A6DDDF42; Mon, 1 Jul 2024 08:01:19 +0000 (UTC) From: Johannes Thumshirn <jth@kernel.org> To: linux-btrfs@vger.kernel.org Cc: Anand Jain <anand.jain@oracle.com>, Zorro Lang <zlang@redhat.com>, fstests@vger.kernel.org, Filipe Manana <fdmanana@suse.com>, Johannes Thumshirn <johannes.thumshirn@wdc.com> Subject: [PATCH v2] btrfs: update golden output of RST test cases Date: Mon, 1 Jul 2024 10:01:09 +0200 Message-ID: <20240701080109.20673-1-jth@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[v2] btrfs: update golden output of RST test cases \| expand [v2] btrfs: update golden output of RST test cases

Message ID

20240701080109.20673-1-jth@kernel.org (mailing list archive)

State

New, archived

Headers

From: Johannes Thumshirn <jth@kernel.org>
To: linux-btrfs@vger.kernel.org
Cc: Anand Jain <anand.jain@oracle.com>,
	Zorro Lang <zlang@redhat.com>,
	fstests@vger.kernel.org,
	Filipe Manana <fdmanana@suse.com>,
	Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v2] btrfs: update golden output of RST test cases
Date: Mon,  1 Jul 2024 10:01:09 +0200
Message-ID: <20240701080109.20673-1-jth@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[v2] btrfs: update golden output of RST test cases | expand

Commit Message

Johannes Thumshirn July 1, 2024, 8:01 a.m. UTC

From: Johannes Thumshirn <johannes.thumshirn@wdc.com>

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>
---

Changes to v1:
- Mention the kernel and btrfs-progs changes mandating this change.


 tests/btrfs/304.out |  9 +++------
 tests/btrfs/305.out | 24 ++++++++----------------
 tests/btrfs/306.out | 18 ++++++------------
 tests/btrfs/307.out | 15 +++++----------
 tests/btrfs/308.out | 39 +++++++++++++--------------------------
 5 files changed, 35 insertions(+), 70 deletions(-)

Comments

Filipe Manana July 1, 2024, 9:15 a.m. UTC | #1

On Mon, Jul 1, 2024 at 9:01 AM Johannes Thumshirn <jth@kernel.org> wrote:
>
> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>
> 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>

Thanks!

> ---
>
> Changes to v1:
> - Mention the kernel and btrfs-progs changes mandating this change.
>
>
>  tests/btrfs/304.out |  9 +++------
>  tests/btrfs/305.out | 24 ++++++++----------------
>  tests/btrfs/306.out | 18 ++++++------------
>  tests/btrfs/307.out | 15 +++++----------
>  tests/btrfs/308.out | 39 +++++++++++++--------------------------
>  5 files changed, 35 insertions(+), 70 deletions(-)
>
> diff --git a/tests/btrfs/304.out b/tests/btrfs/304.out
> index 39f56f32274d..97ec27455b01 100644
> --- a/tests/btrfs/304.out
> +++ b/tests/btrfs/304.out
> @@ -12,8 +12,7 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -30,8 +29,7 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -49,8 +47,7 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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 7090626c3036..02642c904b1e 100644
> --- a/tests/btrfs/305.out
> +++ b/tests/btrfs/305.out
> @@ -14,14 +14,11 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -40,12 +37,10 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -65,16 +60,13 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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 25065674c77b..954567db7623 100644
> --- a/tests/btrfs/306.out
> +++ b/tests/btrfs/306.out
> @@ -14,11 +14,9 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -37,12 +35,10 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -62,12 +58,10 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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 2815d17d7f03..e2f1d3d84a68 100644
> --- a/tests/btrfs/307.out
> +++ b/tests/btrfs/307.out
> @@ -12,11 +12,9 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -33,8 +31,7 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -52,12 +49,10 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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 23b31dd32959..75e010d54252 100644
> --- a/tests/btrfs/308.out
> +++ b/tests/btrfs/308.out
> @@ -16,20 +16,15 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -50,16 +45,13 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> @@ -81,24 +73,19 @@ checksum stored <CHECKSUM>
>  checksum calced <CHECKSUM>
>  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
> --
> 2.43.0
>
>

Qu Wenruo July 1, 2024, 9:39 a.m. UTC | #2

在 2024/7/1 17:31, Johannes Thumshirn 写道:
> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>
> 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: Qu Wenruo <wqu@suse.com>

Thanks,
Qu
> ---
>
> Changes to v1:
> - Mention the kernel and btrfs-progs changes mandating this change.
>
>
>   tests/btrfs/304.out |  9 +++------
>   tests/btrfs/305.out | 24 ++++++++----------------
>   tests/btrfs/306.out | 18 ++++++------------
>   tests/btrfs/307.out | 15 +++++----------
>   tests/btrfs/308.out | 39 +++++++++++++--------------------------
>   5 files changed, 35 insertions(+), 70 deletions(-)
>
> diff --git a/tests/btrfs/304.out b/tests/btrfs/304.out
> index 39f56f32274d..97ec27455b01 100644
> --- a/tests/btrfs/304.out
> +++ b/tests/btrfs/304.out
> @@ -12,8 +12,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -30,8 +29,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -49,8 +47,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 7090626c3036..02642c904b1e 100644
> --- a/tests/btrfs/305.out
> +++ b/tests/btrfs/305.out
> @@ -14,14 +14,11 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -40,12 +37,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -65,16 +60,13 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 25065674c77b..954567db7623 100644
> --- a/tests/btrfs/306.out
> +++ b/tests/btrfs/306.out
> @@ -14,11 +14,9 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -37,12 +35,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -62,12 +58,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 2815d17d7f03..e2f1d3d84a68 100644
> --- a/tests/btrfs/307.out
> +++ b/tests/btrfs/307.out
> @@ -12,11 +12,9 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -33,8 +31,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -52,12 +49,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 23b31dd32959..75e010d54252 100644
> --- a/tests/btrfs/308.out
> +++ b/tests/btrfs/308.out
> @@ -16,20 +16,15 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -50,16 +45,13 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -81,24 +73,19 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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

Anand Jain July 12, 2024, 4:16 p.m. UTC | #3

On 01/07/2024 16:01, Johannes Thumshirn wrote:
> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
> 
> 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>
> ---
> 
> Changes to v1:
> - Mention the kernel and btrfs-progs changes mandating this change.
> 
> 

Reviewed-by: Anand Jain <anand.jain@oracle.com>

Applied.

Thanks, Anand


>   tests/btrfs/304.out |  9 +++------
>   tests/btrfs/305.out | 24 ++++++++----------------
>   tests/btrfs/306.out | 18 ++++++------------
>   tests/btrfs/307.out | 15 +++++----------
>   tests/btrfs/308.out | 39 +++++++++++++--------------------------
>   5 files changed, 35 insertions(+), 70 deletions(-)
> 
> diff --git a/tests/btrfs/304.out b/tests/btrfs/304.out
> index 39f56f32274d..97ec27455b01 100644
> --- a/tests/btrfs/304.out
> +++ b/tests/btrfs/304.out
> @@ -12,8 +12,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -30,8 +29,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -49,8 +47,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 7090626c3036..02642c904b1e 100644
> --- a/tests/btrfs/305.out
> +++ b/tests/btrfs/305.out
> @@ -14,14 +14,11 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -40,12 +37,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -65,16 +60,13 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 25065674c77b..954567db7623 100644
> --- a/tests/btrfs/306.out
> +++ b/tests/btrfs/306.out
> @@ -14,11 +14,9 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -37,12 +35,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -62,12 +58,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 2815d17d7f03..e2f1d3d84a68 100644
> --- a/tests/btrfs/307.out
> +++ b/tests/btrfs/307.out
> @@ -12,11 +12,9 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -33,8 +31,7 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -52,12 +49,10 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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 23b31dd32959..75e010d54252 100644
> --- a/tests/btrfs/308.out
> +++ b/tests/btrfs/308.out
> @@ -16,20 +16,15 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -50,16 +45,13 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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
> @@ -81,24 +73,19 @@ checksum stored <CHECKSUM>
>   checksum calced <CHECKSUM>
>   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

diff --git a/tests/btrfs/304.out b/tests/btrfs/304.out
index 39f56f32274d..97ec27455b01 100644
--- a/tests/btrfs/304.out
+++ b/tests/btrfs/304.out
@@ -12,8 +12,7 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -30,8 +29,7 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -49,8 +47,7 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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 7090626c3036..02642c904b1e 100644
--- a/tests/btrfs/305.out
+++ b/tests/btrfs/305.out
@@ -14,14 +14,11 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -40,12 +37,10 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -65,16 +60,13 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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 25065674c77b..954567db7623 100644
--- a/tests/btrfs/306.out
+++ b/tests/btrfs/306.out
@@ -14,11 +14,9 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -37,12 +35,10 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -62,12 +58,10 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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 2815d17d7f03..e2f1d3d84a68 100644
--- a/tests/btrfs/307.out
+++ b/tests/btrfs/307.out
@@ -12,11 +12,9 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -33,8 +31,7 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -52,12 +49,10 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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 23b31dd32959..75e010d54252 100644
--- a/tests/btrfs/308.out
+++ b/tests/btrfs/308.out
@@ -16,20 +16,15 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -50,16 +45,13 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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
@@ -81,24 +73,19 @@  checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 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

[v2] btrfs: update golden output of RST test cases

Commit Message

Comments

Patch