• Linus Torvalds's avatar
    Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux · 8829687a
    Linus Torvalds authored
    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
    8829687a
super.c 131 KB