Skip to contentSkip to conversation

ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION

PATCH Applied Eric Biggers 3 participants 3 messages Nov 23, 2023

Subsystems (3)
lore
Share & tools
lore

Eric Biggers

author maintainer
#0 lore raw

PATCH 1/1 ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION

From: Eric Biggers <[email protected]>

The kconfig options for filesystems that support FS_ENCRYPTION are supposed to select FS_ENCRYPTION_ALGS. This is needed to ensure that required crypto algorithms get enabled as loadable modules or builtin as is appropriate for the set of enabled filesystems. Do this for CEPH_FS so that there aren't any missing algorithms if someone happens to have CEPH_FS as their only enabled filesystem that supports encryption.

Fixes f061feda6c54 ("ceph: add fscrypt ioctls and ceph.fscrypt.auth vxattr")
---
 fs/ceph/Kconfig | 1 +
 1 file changed, 1 insertion(+)
fs/ceph/Kconfig +1 -0
index 94df854147d35..7249d70e1a43f 100644
@@ -1,19 +1,20 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config CEPH_FS
 	tristate "Ceph distributed file system"
 	depends on INET
 	select CEPH_LIB
 	select LIBCRC32C
 	select CRYPTO_AES
 	select CRYPTO
 	select NETFS_SUPPORT
+	select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
 	default n
 	help
 	  Choose Y or M here to include support for mounting the
 	  experimental Ceph distributed file system.  Ceph is an extremely
 	  scalable file system designed to provide high performance,
 	  reliable access to petabytes of storage.
 
 	  More information at https://ceph.io/.
 
 	  If unsure, say N.

base-commit: 9b6de136b5f0158c60844f85286a593cb70fb364

Signature · 1 line
2.42.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 42 lines · Eric Biggers

From: Eric Biggers <[email protected]>

The kconfig options for filesystems that support FS_ENCRYPTION are supposed to select FS_ENCRYPTION_ALGS. This is needed to ensure that required crypto algorithms get enabled as loadable modules or builtin as is appropriate for the set of enabled filesystems. Do this for CEPH_FS so that there aren't any missing algorithms if someone happens to have CEPH_FS as their only enabled filesystem that supports encryption.

Fixes f061feda6c54 ("ceph: add fscrypt ioctls and ceph.fscrypt.auth vxattr")
---
  fs/ceph/Kconfig | 1 +
  1 file changed, 1 insertion(+)
fs/ceph/Kconfig +1 -0
index 94df854147d35..7249d70e1a43f 100644
@@ -1,19 +1,20 @@
  # SPDX-License-Identifier: GPL-2.0-only
  config CEPH_FS
  	tristate "Ceph distributed file system"
  	depends on INET
  	select CEPH_LIB
  	select LIBCRC32C
  	select CRYPTO_AES
  	select CRYPTO
  	select NETFS_SUPPORT
+	select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
  	default n
  	help
  	  Choose Y or M here to include support for mounting the
  	  experimental Ceph distributed file system.  Ceph is an extremely
  	  scalable file system designed to provide high performance,
  	  reliable access to petabytes of storage.
 
  	  More information at https://ceph.io/.
 
  	  If unsure, say N.
Quoted 1 line

base-commit: 9b6de136b5f0158c60844f85286a593cb70fb364

Thanks Eric. This looks good to me.

maintainer Applied
#2 lore raw
Quoted 43 lines · Xiubo Li
Quoted 40 lines · Eric Biggers

From: Eric Biggers <[email protected]>

The kconfig options for filesystems that support FS_ENCRYPTION are supposed to select FS_ENCRYPTION_ALGS. This is needed to ensure that required crypto algorithms get enabled as loadable modules or builtin as is appropriate for the set of enabled filesystems. Do this for CEPH_FS so that there aren't any missing algorithms if someone happens to have CEPH_FS as their only enabled filesystem that supports encryption.

Fixes f061feda6c54 ("ceph: add fscrypt ioctls and ceph.fscrypt.auth vxattr")
---
  fs/ceph/Kconfig | 1 +
  1 file changed, 1 insertion(+)
fs/ceph/Kconfig +1 -0
index 94df854147d35..7249d70e1a43f 100644
@@ -1,19 +1,20 @@
  # SPDX-License-Identifier: GPL-2.0-only
  config CEPH_FS
      tristate "Ceph distributed file system"
      depends on INET
      select CEPH_LIB
      select LIBCRC32C
      select CRYPTO_AES
      select CRYPTO
      select NETFS_SUPPORT
+     select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
      default n
      help
        Choose Y or M here to include support for mounting the
        experimental Ceph distributed file system.  Ceph is an extremely
        scalable file system designed to provide high performance,
        reliable access to petabytes of storage.
 
        More information at https://ceph.io/.
 
Quoted 7 lines
Quoted 3 lines
fs/ceph/Kconfig +0 -0
        If unsure, say N.

base-commit: 9b6de136b5f0158c60844f85286a593cb70fb364

Thanks Eric. This looks good to me.

Applied.

Thanks,

Ilya