[PATCH 0/2] btrfs-progs: update on-disk format for raid-stripe-tree

[PATCH 0/2] btrfs-progs: update on-disk format for raid-stripe-tree

[Johannes Thumshirn]

This series brings the RAID stripe tree on-disk format in btrfs-progs to
the same level as the kernel.

---
Johannes Thumshirn (2):
      btrfs-progs: remove stride length from tree dump
      btrfs-progs: remove stride length from on-disk format

 kernel-shared/accessors.h       | 8 --------
 kernel-shared/print-tree.c      | 5 ++---
 kernel-shared/uapi/btrfs_tree.h | 2 --
 3 files changed, 2 insertions(+), 13 deletions(-)
---
base-commit: da936ca80c5e46a671f513017808395223c12cea
change-id: 20231005-rst-update-73b16916acc8

Best regards,
-- 
Johannes Thumshirn <johannes.thumshirn@wdc.com>

[PATCH 1/2] btrfs-progs: remove stride length from tree dump

[Johannes Thumshirn]

Fixes: ecd6fb44c172 ("btrfs-progs: add dump tree support for the raid stripe tree")
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
 kernel-shared/print-tree.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c
index 26524a13304c..7ec9035567f7 100644
--- a/kernel-shared/print-tree.c
+++ b/kernel-shared/print-tree.c
@@ -681,10 +681,9 @@ static void print_raid_stripe_key(struct extent_buffer *eb,
 
 	printf("\t\t\tencoding: %s\n", stripe_encoding_name(encoding));
 	for (int i = 0; i < num_stripes; i++)
-		printf("\t\t\tstripe %d devid %llu physical %llu length %llu\n", i,
+		printf("\t\t\tstripe %d devid %llu physical %llu\n", i,
 		       (unsigned long long)btrfs_raid_stride_devid_nr(eb, stripe, i),
-		       (unsigned long long)btrfs_raid_stride_offset_nr(eb, stripe, i),
-		       (unsigned long long)btrfs_raid_stride_length_nr(eb, stripe, i));
+		       (unsigned long long)btrfs_raid_stride_offset_nr(eb, stripe, i));
 }
 
 void print_key_type(FILE *stream, u64 objectid, u8 type)

-- 
2.41.0

[PATCH 2/2] btrfs-progs: remove stride length from on-disk format

[Johannes Thumshirn]

Fixes: 0e6b800eb9d6 ("btrfs-progs: add raid stripe tree definitions")
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
 kernel-shared/accessors.h       | 8 --------
 kernel-shared/uapi/btrfs_tree.h | 2 --
 2 files changed, 10 deletions(-)

diff --git a/kernel-shared/accessors.h b/kernel-shared/accessors.h
index 688edf9e909f..bc613a55ba73 100644
--- a/kernel-shared/accessors.h
+++ b/kernel-shared/accessors.h
@@ -282,7 +282,6 @@ BTRFS_SETGET_FUNCS(free_space_flags, struct btrfs_free_space_info, flags, 32);
 BTRFS_SETGET_FUNCS(stripe_extent_encoding, struct btrfs_stripe_extent, encoding, 8);
 BTRFS_SETGET_FUNCS(raid_stride_devid, struct btrfs_raid_stride, devid, 64);
 BTRFS_SETGET_FUNCS(raid_stride_offset, struct btrfs_raid_stride, offset, 64);
-BTRFS_SETGET_FUNCS(raid_stride_length, struct btrfs_raid_stride, length, 64);
 
 static inline struct btrfs_raid_stride *btrfs_raid_stride_nr(
 						 struct btrfs_stripe_extent *dps,
@@ -309,13 +308,6 @@ static inline u64 btrfs_raid_stride_offset_nr(struct extent_buffer *eb,
 	return btrfs_raid_stride_offset(eb, btrfs_raid_stride_nr(dps, nr));
 }
 
-static inline u64 btrfs_raid_stride_length_nr(struct extent_buffer *eb,
-					      struct btrfs_stripe_extent *dps,
-					      int nr)
-{
-	return btrfs_raid_stride_length(eb, btrfs_raid_stride_nr(dps, nr));
-}
-
 /* struct btrfs_inode_ref */
 BTRFS_SETGET_FUNCS(inode_ref_name_len, struct btrfs_inode_ref, name_len, 16);
 BTRFS_SETGET_FUNCS(inode_ref_index, struct btrfs_inode_ref, index, 64);
diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h
index 8d8898b93c07..32f2c2d7c29f 100644
--- a/kernel-shared/uapi/btrfs_tree.h
+++ b/kernel-shared/uapi/btrfs_tree.h
@@ -707,8 +707,6 @@ struct btrfs_raid_stride {
 	__le64 devid;
 	/* offset from  the devextent start */
 	__le64 offset;
-	/* length of the stride on disk */
-	__le64 length;
 } __attribute__ ((__packed__));
 
 /* The stripe_extent::encoding, 1:1 mapping of enum btrfs_raid_types */

-- 
2.41.0

Re: [PATCH 0/2] btrfs-progs: update on-disk format for raid-stripe-tree

[David Sterba]

On Thu, Oct 05, 2023 at 11:58:01PM -0700, Johannes Thumshirn wrote:
> This series brings the RAID stripe tree on-disk format in btrfs-progs to
> the same level as the kernel.

I've added changelogs explaining that it's been removed in kernel. The
previous RST series has been released so we can't do fixups.