Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt updates from Eric Biggers: "First: Ted, Jaegeuk, and I have decided to add me as a co-maintainer for fscrypt, and we're now using a shared git tree. So we've updated MAINTAINERS accordingly, and I'm doing the pull request this time. The actual changes for v5.1 are: - Remove the fs-specific kconfig options like CONFIG_EXT4_ENCRYPTION and make fscrypt support for all fscrypt-capable filesystems be controlled by CONFIG_FS_ENCRYPTION, similar to how CONFIG_QUOTA works. - Improve error code for rename() and link() into encrypted directories. - Various cleanups" * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: MAINTAINERS: add Eric Biggers as an fscrypt maintainer fscrypt: return -EXDEV for incompatible rename or link into encrypted dir fscrypt: remove filesystem specific build config option f2fs: use IS_ENCRYPTED() to check encryption status ext4: use IS_ENCRYPTED() to check encryption status fscrypt: remove CRYPTO_CTR dependency
Showing
- Documentation/filesystems/fscrypt.rst 12 additions, 4 deletionsDocumentation/filesystems/fscrypt.rst
- MAINTAINERS 2 additions, 1 deletionMAINTAINERS
- arch/mips/configs/generic_defconfig 1 addition, 1 deletionarch/mips/configs/generic_defconfig
- arch/nds32/configs/defconfig 1 addition, 1 deletionarch/nds32/configs/defconfig
- arch/s390/configs/debug_defconfig 1 addition, 1 deletionarch/s390/configs/debug_defconfig
- arch/s390/configs/performance_defconfig 1 addition, 1 deletionarch/s390/configs/performance_defconfig
- fs/crypto/Kconfig 3 additions, 3 deletionsfs/crypto/Kconfig
- fs/crypto/fscrypt_private.h 0 additions, 1 deletionfs/crypto/fscrypt_private.h
- fs/crypto/hooks.c 3 additions, 3 deletionsfs/crypto/hooks.c
- fs/crypto/policy.c 1 addition, 2 deletionsfs/crypto/policy.c
- fs/ext4/Kconfig 0 additions, 15 deletionsfs/ext4/Kconfig
- fs/ext4/dir.c 4 additions, 6 deletionsfs/ext4/dir.c
- fs/ext4/ext4.h 3 additions, 9 deletionsfs/ext4/ext4.h
- fs/ext4/ext4_jbd2.h 1 addition, 1 deletionfs/ext4/ext4_jbd2.h
- fs/ext4/extents.c 2 additions, 2 deletionsfs/ext4/extents.c
- fs/ext4/ialloc.c 1 addition, 1 deletionfs/ext4/ialloc.c
- fs/ext4/inode.c 11 additions, 13 deletionsfs/ext4/inode.c
- fs/ext4/ioctl.c 2 additions, 2 deletionsfs/ext4/ioctl.c
- fs/ext4/move_extent.c 1 addition, 2 deletionsfs/ext4/move_extent.c
- fs/ext4/namei.c 9 additions, 9 deletionsfs/ext4/namei.c
Loading
Please register or sign in to comment