]> git.hungrycats.org Git - btrfs-progs/commitdiff
btrfs-progs: start tracking extent encryption context info
authorSweet Tea Dorminy <sweettea-kernel@dorminy.me>
Tue, 7 Jul 2026 14:27:31 +0000 (16:27 +0200)
committerDavid Sterba <dsterba@suse.com>
Tue, 14 Jul 2026 22:28:53 +0000 (00:28 +0200)
This recapitulates the kernel change named 'btrfs: start tracking extent
encryption context info".

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Signed-off-by: Daniel Vacek <neelx@suse.com>
kernel-shared/tree-checker.c
kernel-shared/uapi/btrfs_tree.h

index 5e71642202c1cca3dfbd86b279dd4d483184f974..cd3d5d27b70bda9fcec46d1d0fac9206d36d9e7a 100644 (file)
@@ -239,6 +239,8 @@ static int check_extent_data_item(struct extent_buffer *leaf,
        u32 sectorsize = fs_info->sectorsize;
        u32 item_size = btrfs_item_size(leaf, slot);
        u64 extent_end;
+       u8 policy;
+       u8 fe_type;
 
        if (unlikely(!IS_ALIGNED(key->offset, sectorsize))) {
                file_extent_err(leaf, slot,
@@ -269,12 +271,12 @@ static int check_extent_data_item(struct extent_buffer *leaf,
                                SZ_4K);
                return -EUCLEAN;
        }
-       if (unlikely(btrfs_file_extent_type(leaf, fi) >=
-                    BTRFS_NR_FILE_EXTENT_TYPES)) {
+
+       fe_type = btrfs_file_extent_type(leaf, fi);
+       if (unlikely(fe_type >= BTRFS_NR_FILE_EXTENT_TYPES)) {
                file_extent_err(leaf, slot,
                "invalid type for file extent, have %u expect range [0, %u]",
-                       btrfs_file_extent_type(leaf, fi),
-                       BTRFS_NR_FILE_EXTENT_TYPES - 1);
+                       fe_type, BTRFS_NR_FILE_EXTENT_TYPES - 1);
                return -EUCLEAN;
        }
 
@@ -290,10 +292,11 @@ static int check_extent_data_item(struct extent_buffer *leaf,
                        BTRFS_NR_COMPRESS_TYPES - 1);
                return -EUCLEAN;
        }
-       if (unlikely(btrfs_file_extent_encryption(leaf, fi))) {
+       policy = btrfs_file_extent_encryption(leaf, fi);
+       if (unlikely(policy >= BTRFS_NR_ENCRYPTION_TYPES)) {
                file_extent_err(leaf, slot,
-                       "invalid encryption for file extent, have %u expect 0",
-                       btrfs_file_extent_encryption(leaf, fi));
+                       "invalid encryption for file extent, have %u expect range [0, %u]",
+                       policy, BTRFS_NR_ENCRYPTION_TYPES - 1);
                return -EUCLEAN;
        }
        if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) {
index 1ca6371186220924f717b4ee1be137df90d3a8f9..74d307f1294303c60e99bb7d414c8fa4833bad14 100644 (file)
@@ -1072,6 +1072,12 @@ enum {
        BTRFS_NR_FILE_EXTENT_TYPES = 3,
 };
 
+enum {
+       BTRFS_ENCRYPTION_NONE,
+       BTRFS_ENCRYPTION_FSCRYPT,
+       BTRFS_NR_ENCRYPTION_TYPES,
+};
+
 struct btrfs_file_extent_item {
        /*
         * transaction id that created this extent