Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad8ceb03 authored by Chandan Rajendra's avatar Chandan Rajendra Committed by Jaegeuk Kim
Browse files

fscrypt: remove filesystem specific build config option 



In order to have a common code base for fscrypt "post read" processing
for all filesystems which support encryption, this commit removes
filesystem specific build config option (e.g. CONFIG_EXT4_FS_ENCRYPTION)
and replaces it with a build option (i.e. CONFIG_FS_ENCRYPTION) whose
value affects all the filesystems making use of fscrypt.

Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarChandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 08212993

Documentation/filesystems/fscrypt.rst

+2 −2
Original line number Diff line number Diff line
@@ -343,9 +343,9 @@ FS_IOC_SET_ENCRYPTION_POLICY can fail with the following errors: 
- ``ENOTEMPTY``: the file is unencrypted and is a nonempty directory

- ``ENOTTY``: this type of filesystem does not implement encryption

- ``EOPNOTSUPP``: the kernel was not configured with encryption

  support for this filesystem, or the filesystem superblock has not

  support for filesystems, or the filesystem superblock has not

  had encryption enabled on it.  (For example, to use encryption on an

  ext4 filesystem, CONFIG_EXT4_ENCRYPTION must be enabled in the

  ext4 filesystem, CONFIG_FS_ENCRYPTION must be enabled in the

  kernel config, and the superblock must have had the "encrypt"

  feature flag enabled using ``tune2fs -O encrypt`` or ``mkfs.ext4 -O

  encrypt``.)

arch/mips/configs/generic_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ CONFIG_HID_MONTEREY=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FANOTIFY=y

CONFIG_FUSE_FS=y

CONFIG_CUSE=y

arch/nds32/configs/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ CONFIG_GENERIC_PHY=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

arch/s390/configs/debug_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,6 @@ CONFIG_VIRTIO_INPUT=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -512,6 +511,7 @@ CONFIG_BTRFS_DEBUG=y 
CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

arch/s390/configs/performance_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,6 @@ CONFIG_VIRTIO_INPUT=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -507,6 +506,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y 
CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA_NETLINK_INTERFACE=y