diff options
| author |   Qu Wenruo <wqu@suse.com> | 2020-09-22 10:37:01 +0800 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2020-10-07 12:13:23 +0200 |
| commit | 1465af12e254a68706e110846f59cf0f09683184 (patch) | |
| tree | 1720a50ff0d674e104c28f5653194c20f65855dd /include/uapi/linux/btrfs_tree.h | |
| parent | btrfs: use unaligned helpers for stack and header set/get helpers (diff) | |
| download | linux-dev-1465af12e254a68706e110846f59cf0f09683184.tar.xz linux-dev-1465af12e254a68706e110846f59cf0f09683184.zip | |
btrfs: tree-checker: fix false alert caused by legacy btrfs root item
Commit 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")
introduced btrfs root item size check, however btrfs root item has two
versions, the legacy one which just ends before generation_v2 member, is
smaller than current btrfs root item size.
This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can
already handle them pretty well and upgrade to newer root item format
when needed.
Reported-by: Martin Steigerwald <martin@lichtvoll.de>
Fixes: 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")
CC: stable@vger.kernel.org # 5.4+
Tested-By: Martin Steigerwald <martin@lichtvoll.de>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'include/uapi/linux/btrfs_tree.h')
| -rw-r--r-- | include/uapi/linux/btrfs_tree.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index 9ba64ca6b4ac..6b885982ece6 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -4,6 +4,11 @@ #include <linux/btrfs.h> #include <linux/types.h> +#ifdef __KERNEL__ +#include <linux/stddef.h> +#else +#include <stddef.h> +#endif /* * This header contains the structure definitions and constants used @@ -645,6 +650,15 @@ struct btrfs_root_item { } __attribute__ ((__packed__)); /* + * Btrfs root item used to be smaller than current size. The old format ends + * at where member generation_v2 is. + */ +static inline __u32 btrfs_legacy_root_item_size(void) +{ + return offsetof(struct btrfs_root_item, generation_v2); +} + +/* * this is used for both forward and backward root refs */ struct btrfs_root_ref { |