This is a rebase and cleanup of older patches [0] from Sweet Tea and Josef fixed to work with the recent kernel and btrfs-progs changes.
[0] https://github.com/btrfs/fstests/tree/fscrypt (227ac42) Daniel Vacek (1): fscrypt-crypt-util: add support for per extent KDF Josef Bacik (4): fstests: properly test for v1 encryption policies in encrypt tests fstests: split generic/580 into two tests fstests: split generic/581 into two tests fstests: split generic/613 into two tests Sweet Tea Dorminy (7): common/encrypt: separate data and inode nonces common/encrypt: add btrfs to get_encryption_*nonce common/encrypt: add btrfs to get_ciphertext_filename common/encrypt: enable making a encrypted btrfs filesystem common/verity: explicitly don't allow btrfs encryption btrfs: add simple test of reflink of encrypted data btrfs: test snapshotting encrypted subvol common/encrypt | 94 ++++++++++++++++++++++++---- common/verity | 4 ++ src/fscrypt-crypt-util.c | 12 +++- tests/btrfs/613 | 54 ++++++++++++++++ tests/btrfs/613.out | 13 ++++ tests/btrfs/614 | 73 ++++++++++++++++++++++ tests/btrfs/614.out | 111 ++++++++++++++++++++++++++++++++ tests/f2fs/002 | 2 +- tests/generic/580 | 118 +++++++++++++++------------------- tests/generic/580.out | 40 ------------ tests/generic/581 | 89 +------------------------- tests/generic/581.out | 50 --------------- tests/generic/593 | 1 + tests/generic/613 | 24 +++---- tests/generic/613.out | 5 +- tests/generic/798 | 77 +++++++++++++++++++++++ tests/generic/798.out | 44 +++++++++++++ tests/generic/799 | 132 +++++++++++++++++++++++++++++++++++++++ tests/generic/799.out | 51 +++++++++++++++ tests/generic/800 | 115 ++++++++++++++++++++++++++++++++++ tests/generic/800.out | 14 +++++ 21 files changed, 845 insertions(+), 278 deletions(-) create mode 100755 tests/btrfs/613 create mode 100644 tests/btrfs/613.out create mode 100755 tests/btrfs/614 create mode 100644 tests/btrfs/614.out create mode 100755 tests/generic/798 create mode 100644 tests/generic/798.out create mode 100755 tests/generic/799 create mode 100644 tests/generic/799.out create mode 100755 tests/generic/800 create mode 100644 tests/generic/800.out -- 2.53.0
