From 7c549b5f7cc0430c6ffe63f1371b6504ccacd55f Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn Date: Thu, 20 Jun 2024 09:54:55 +0200 Subject: [PATCH] btrfs-progs: remove raid stripe encoding Remove the not needed encoding and reserved fields in struct raid_stripe_extent. This saves 8 bytes per stripe extent. Note: this is a format change and previously created filesystems with raid-stripe-tree will not be accessible. Similar patch is needed in kernel. Signed-off-by: Johannes Thumshirn Signed-off-by: David Sterba --- kernel-shared/accessors.h | 3 --- kernel-shared/print-tree.c | 33 +-------------------------------- kernel-shared/tree-checker.c | 19 ------------------- kernel-shared/uapi/btrfs_tree.h | 14 +------------- 4 files changed, 2 insertions(+), 67 deletions(-) diff --git a/kernel-shared/accessors.h b/kernel-shared/accessors.h index b17c675c..c2681698 100644 --- a/kernel-shared/accessors.h +++ b/kernel-shared/accessors.h @@ -322,11 +322,8 @@ BTRFS_SETGET_FUNCS(timespec_nsec, struct btrfs_timespec, nsec, 32); BTRFS_SETGET_STACK_FUNCS(stack_timespec_sec, struct btrfs_timespec, sec, 64); BTRFS_SETGET_STACK_FUNCS(stack_timespec_nsec, struct btrfs_timespec, nsec, 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_STACK_FUNCS(stack_stripe_extent_encoding, - struct btrfs_stripe_extent, encoding, 8); BTRFS_SETGET_STACK_FUNCS(stack_raid_stride_devid, struct btrfs_raid_stride, devid, 64); static inline struct btrfs_raid_stride *btrfs_raid_stride_nr( diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c index 6f78ec35..1692e647 100644 --- a/kernel-shared/print-tree.c +++ b/kernel-shared/print-tree.c @@ -669,42 +669,11 @@ static void print_free_space_header(struct extent_buffer *leaf, int slot) (unsigned long long)btrfs_free_space_bitmaps(leaf, header)); } -struct raid_encoding_map { - u8 encoding; - char name[16]; -}; - -static const struct raid_encoding_map raid_map[] = { - { BTRFS_STRIPE_DUP, "DUP" }, - { BTRFS_STRIPE_RAID0, "RAID0" }, - { BTRFS_STRIPE_RAID1, "RAID1" }, - { BTRFS_STRIPE_RAID1C3, "RAID1C3" }, - { BTRFS_STRIPE_RAID1C4, "RAID1C4" }, - { BTRFS_STRIPE_RAID5, "RAID5" }, - { BTRFS_STRIPE_RAID6, "RAID6" }, - { BTRFS_STRIPE_RAID10, "RAID10" } -}; - -static const char *stripe_encoding_name(u8 encoding) -{ - for (int i = 0; i < ARRAY_SIZE(raid_map); i++) { - if (raid_map[i].encoding == encoding) - return raid_map[i].name; - } - - return "UNKNOWN"; -} - static void print_raid_stripe_key(struct extent_buffer *eb, u32 item_size, struct btrfs_stripe_extent *stripe) { - int num_stripes; - u8 encoding = btrfs_stripe_extent_encoding(eb, stripe); + int num_stripes = item_size / sizeof(struct btrfs_raid_stride); - num_stripes = (item_size - offsetof(struct btrfs_stripe_extent, strides)) / - sizeof(struct btrfs_raid_stride); - - 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\n", i, (unsigned long long)btrfs_raid_stride_devid_nr(eb, stripe, i), diff --git a/kernel-shared/tree-checker.c b/kernel-shared/tree-checker.c index 8770392b..0be8f022 100644 --- a/kernel-shared/tree-checker.c +++ b/kernel-shared/tree-checker.c @@ -1721,9 +1721,6 @@ static int check_inode_ref(struct extent_buffer *leaf, static int check_raid_stripe_extent(const struct extent_buffer *leaf, const struct btrfs_key *key, int slot) { - struct btrfs_stripe_extent *stripe_extent = - btrfs_item_ptr(leaf, slot, struct btrfs_stripe_extent); - if (unlikely(!IS_ALIGNED(key->objectid, leaf->fs_info->sectorsize))) { generic_err(leaf, slot, "invalid key objectid for raid stripe extent, have %llu expect aligned to %u", @@ -1737,22 +1734,6 @@ static int check_raid_stripe_extent(const struct extent_buffer *leaf, return -EUCLEAN; } - switch (btrfs_stripe_extent_encoding(leaf, stripe_extent)) { - case BTRFS_STRIPE_RAID0: - case BTRFS_STRIPE_RAID1: - case BTRFS_STRIPE_DUP: - case BTRFS_STRIPE_RAID10: - case BTRFS_STRIPE_RAID5: - case BTRFS_STRIPE_RAID6: - case BTRFS_STRIPE_RAID1C3: - case BTRFS_STRIPE_RAID1C4: - break; - default: - generic_err(leaf, slot, "invalid raid stripe encoding %u", - btrfs_stripe_extent_encoding(leaf, stripe_extent)); - return -EUCLEAN; - } - return 0; } diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h index 27134625..5720a03c 100644 --- a/kernel-shared/uapi/btrfs_tree.h +++ b/kernel-shared/uapi/btrfs_tree.h @@ -712,21 +712,9 @@ struct btrfs_raid_stride { __le64 offset; } __attribute__ ((__packed__)); -/* The stripe_extent::encoding, 1:1 mapping of enum btrfs_raid_types */ -#define BTRFS_STRIPE_RAID0 1 -#define BTRFS_STRIPE_RAID1 2 -#define BTRFS_STRIPE_DUP 3 -#define BTRFS_STRIPE_RAID10 4 -#define BTRFS_STRIPE_RAID5 5 -#define BTRFS_STRIPE_RAID6 6 -#define BTRFS_STRIPE_RAID1C3 7 -#define BTRFS_STRIPE_RAID1C4 8 - struct btrfs_stripe_extent { - u8 encoding; - u8 reserved[7]; /* Array of raid strides this stripe is comprised of. */ - struct btrfs_raid_stride strides; + __DECLARE_FLEX_ARRAY(struct btrfs_raid_stride, strides); } __attribute__ ((__packed__)); #define BTRFS_FREE_SPACE_EXTENT 1