[PATCH v3 0/7] btrfs-progs: fscrypt updates

From: Daniel Vacek

Date: Tue Jul 07 2026 - 10:59:45 EST


This series is a rebase of an older set of fscrypt related changes from
Sweet Tea Dorminy and Josef Bacik found here:
https://github.com/josefbacik/btrfs-progs/tree/fscrypt

It passed all my tests. Hopefully nothing blows. Enjoy testing.

v3:
* dropped first patch and improved inline extent length checking
* correctly squashed the context key definitions into "btrfs-progs: add
inode encryption contexts"
* inline extents also show the encryption field now in tree dump

v2: https://lore.kernel.org/linux-btrfs/20260624165144.556908-1-neelx@xxxxxxxx/
* works with v7 of the kernel fscrypt series
* the on-disk format changed and parts of the series had to be reworked
- particularly the encryption context is now stored as dedicated item
and not glued onto extent data item
* also parses the ENCRYPT inode item flag

Daniel Vacek (1):
btrfs-progs: recognize ENCRYPT inode item flag

Sweet Tea Dorminy (6):
btrfs-progs: add new FEATURE_INCOMPAT_ENCRYPT flag
btrfs-progs: start tracking extent encryption context info
btrfs-progs: add inode encryption contexts
btrfs-progs: print encryptin type field of file extents
btrfs-progs: handle fscrypt context items
btrfs-progs: check: update inline extent length checking

check/main.c | 34 ++++++++++++++++++---------------
kernel-shared/ctree.h | 1 +
kernel-shared/print-tree.c | 28 +++++++++++++++++++++++++--
kernel-shared/tree-checker.c | 17 ++++++++++-------
kernel-shared/uapi/btrfs.h | 1 +
kernel-shared/uapi/btrfs_tree.h | 11 +++++++++++
libbtrfsutil/btrfs.h | 1 +
7 files changed, 69 insertions(+), 24 deletions(-)

--
2.53.0