On Wed, 8 Jul 2026 at 00:40, Qu Wenruo <[email protected]> wrote:
> 在 2026/7/7 23:57, Daniel Vacek 写道:
> > From: Sweet Tea Dorminy <[email protected]>
> >
> > Encrypted file extents now have the 'encryption' field set to an
> > encryption type. Let's print it.
> >
> > Signed-off-by: Sweet Tea Dorminy <[email protected]>
> > Signed-off-by: Daniel Vacek <[email protected]>
> > ---
> > check/main.c | 1 -
> > kernel-shared/print-tree.c | 7 +++++--
> > 2 files changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/check/main.c b/check/main.c
> > index 5e29e2c5..7f438302 100644
> > --- a/check/main.c
> > +++ b/check/main.c
> > @@ -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) ||
>
> I think this is a leaf-over change?
For now it is to match the kernel part to allow for wider testing in
the open. If we decide to change the kernel we can revert this later.
--nX
> Thanks,
> Qu
>
> > btrfs_file_extent_other_encoding(eb, fi)))
> > rec->errors |= I_ERR_BAD_FILE_EXTENT;
> > if (compression && rec->nodatasum)
> > diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c
> > index 0afa3696..2c0168b0 100644
> > --- a/kernel-shared/print-tree.c
> > +++ b/kernel-shared/print-tree.c
> > @@ -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") */
>
