mbox series

[GIT,PULL] fscrypt updates for 6.7

Message ID 20231030040419.GA43439@sol.localdomain (mailing list archive)
State Accepted
Headers show
Series [GIT,PULL] fscrypt updates for 6.7 | expand

Pull-request

https://git.kernel.org/pub/scm/fs/fscrypt/linux.git tags/fscrypt-for-linus

Message

Eric Biggers Oct. 30, 2023, 4:04 a.m. UTC
The following changes since commit 6465e260f48790807eef06b583b38ca9789b6072:

  Linux 6.6-rc3 (2023-09-24 14:31:13 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/fs/fscrypt/linux.git tags/fscrypt-for-linus

for you to fetch changes up to 15baf55481de700f8c4494cddb80ec4f4575548b:

  fscrypt: track master key presence separately from secret (2023-10-16 21:23:45 -0700)

----------------------------------------------------------------

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.

----------------------------------------------------------------
Eric Biggers (6):
      fscrypt: make it clearer that key_prefix is deprecated
      fscrypt: make the bounce page pool opt-in instead of opt-out
      fscrypt: compute max_lblk_bits from s_maxbytes and block size
      fscrypt: replace get_ino_and_lblk_bits with just has_32bit_inodes
      fscrypt: support crypto data unit size less than filesystem block size
      fscrypt: track master key presence separately from secret

Josef Bacik (1):
      fscrypt: rename fscrypt_info => fscrypt_inode_info

 Documentation/filesystems/fscrypt.rst | 121 ++++++++++++++++++-------
 fs/ceph/crypto.c                      |   1 +
 fs/crypto/bio.c                       |  39 ++++----
 fs/crypto/crypto.c                    | 163 ++++++++++++++++++---------------
 fs/crypto/fname.c                     |   6 +-
 fs/crypto/fscrypt_private.h           | 164 ++++++++++++++++++++++------------
 fs/crypto/hooks.c                     |   4 +-
 fs/crypto/inline_crypt.c              |  32 +++----
 fs/crypto/keyring.c                   |  82 ++++++++++-------
 fs/crypto/keysetup.c                  |  62 +++++++------
 fs/crypto/keysetup_v1.c               |  20 +++--
 fs/crypto/policy.c                    |  83 +++++++++++------
 fs/ext4/crypto.c                      |  13 +--
 fs/f2fs/super.c                       |  13 +--
 fs/ubifs/crypto.c                     |   3 +-
 include/linux/fs.h                    |   4 +-
 include/linux/fscrypt.h               |  82 ++++++++++-------
 include/uapi/linux/fscrypt.h          |   3 +-
 18 files changed, 546 insertions(+), 349 deletions(-)

Comments

pr-tracker-bot@kernel.org Oct. 30, 2023, 11:50 p.m. UTC | #1
The pull request you sent on Sun, 29 Oct 2023 21:04:19 -0700:

> https://git.kernel.org/pub/scm/fs/fscrypt/linux.git tags/fscrypt-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8829687a4ac1d484639425a691da46f6e361aec1

Thank you!