]> git.hungrycats.org Git - btrfs-progs/commitdiff
btrfs-progs: print encryptin type field of file extents
authorSweet Tea Dorminy <sweettea-kernel@dorminy.me>
Tue, 7 Jul 2026 14:27:33 +0000 (16:27 +0200)
committerDavid Sterba <dsterba@suse.com>
Tue, 14 Jul 2026 22:28:53 +0000 (00:28 +0200)
Encrypted file extents now have the 'encryption' field set to an
encryption type.  Let's print it.

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>
check/main.c
kernel-shared/print-tree.c

index 5e29e2c593437daa967a48b63b77f4667d3bed8f..7f43830297893b3ae37e76064e87232931bb32dc 100644 (file)
@@ -1778,7 +1778,6 @@ static int process_file_extent(struct btrfs_root *root,
                        rec->errors |= I_ERR_BAD_FILE_EXTENT;
                if (extent_type == BTRFS_FILE_EXTENT_PREALLOC &&
                    (btrfs_file_extent_compression(eb, fi) ||
-                    btrfs_file_extent_encryption(eb, fi) ||
                     btrfs_file_extent_other_encoding(eb, fi)))
                        rec->errors |= I_ERR_BAD_FILE_EXTENT;
                if (compression && rec->nodatasum)
index 0afa36963b6aaddd8e1b4207f5eb7b31861f2102..2c0168b0dc59921f679b5e66f87e01a8a85af950 100644 (file)
@@ -445,11 +445,12 @@ static void print_file_extent_item(struct extent_buffer *eb,
                        extent_type, file_extent_type_to_str(extent_type));
 
        if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
-               printf("\t\tinline extent data size %u ram_bytes %llu compression %hhu (%s)\n",
+               printf("\t\tinline extent data size %u ram_bytes %llu compression %hhu (%s) encryption %hhu\n",
                                btrfs_file_extent_inline_item_len(eb, slot),
                                btrfs_file_extent_ram_bytes(eb, fi),
                                btrfs_file_extent_compression(eb, fi),
-                               compress_str);
+                               compress_str,
+                               btrfs_file_extent_encryption(eb, fi));
                return;
        }
        if (extent_type == BTRFS_FILE_EXTENT_PREALLOC) {
@@ -471,6 +472,8 @@ static void print_file_extent_item(struct extent_buffer *eb,
        printf("\t\textent compression %hhu (%s)\n",
                        btrfs_file_extent_compression(eb, fi),
                        compress_str);
+       printf("\t\textent encryption %hhu\n",
+                       btrfs_file_extent_encryption(eb, fi));
 }
 
 /* Caller should ensure sizeof(*ret) >= 16("DATA|TREE_BLOCK") */