diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-30 10:23:42 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-30 10:23:42 -1000 |
| commit | 8829687a4ac1d484639425a691da46f6e361aec1 (patch) | |
| tree | c94838a7bd7f321962e1abff648fbbf1172d34b6 /fs/ubifs | |
| parent | Merge tag 'nfsd-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux (diff) | |
| parent | fscrypt: track master key presence separately from secret (diff) | |
| download | wireguard-linux-8829687a4ac1d484639425a691da46f6e361aec1.tar.xz wireguard-linux-8829687a4ac1d484639425a691da46f6e361aec1.zip | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
Pull fscrypt updates from Eric Biggers:
"This update adds support for configuring the crypto data unit size
(i.e. the granularity of file contents encryption) to be less than the
filesystem block size. This can allow users to use inline encryption
hardware in some cases when it wouldn't otherwise be possible.
In addition, there are two commits that are prerequisites for the
extent-based encryption support that the btrfs folks are working on"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
fscrypt: track master key presence separately from secret
fscrypt: rename fscrypt_info => fscrypt_inode_info
fscrypt: support crypto data unit size less than filesystem block size
fscrypt: replace get_ino_and_lblk_bits with just has_32bit_inodes
fscrypt: compute max_lblk_bits from s_maxbytes and block size
fscrypt: make the bounce page pool opt-in instead of opt-out
fscrypt: make it clearer that key_prefix is deprecated
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/crypto.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c index 3125e76376ee..921f9033d0d2 100644 --- a/fs/ubifs/crypto.c +++ b/fs/ubifs/crypto.c @@ -88,8 +88,7 @@ int ubifs_decrypt(const struct inode *inode, struct ubifs_data_node *dn, } const struct fscrypt_operations ubifs_crypt_operations = { - .flags = FS_CFLG_OWN_PAGES, - .key_prefix = "ubifs:", + .legacy_key_prefix = "ubifs:", .get_context = ubifs_crypt_get_context, .set_context = ubifs_crypt_set_context, .empty_dir = ubifs_crypt_empty_dir, |