On Fri, Dec 01, 2023 at 05:11:14PM -0500, Josef Bacik wrote:
> From: Sweet Tea Dorminy <sweettea-kernel@xxxxxxxxxx>
>
> Since encryption is currently under BTRFS_DEBUG, this adds its
> dependencies: inline encryption from fscrypt, and the inline encryption
> fallback path from the block layer.
>
> Signed-off-by: Sweet Tea Dorminy <sweettea-kernel@xxxxxxxxxx>
> Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
> ---
> fs/btrfs/ioctl.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 9968a36079c4..0e8e2ca48a2e 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -4573,6 +4573,7 @@ long btrfs_ioctl(struct file *file, unsigned int
> return btrfs_ioctl_get_fslabel(fs_info, argp);
> case FS_IOC_SETFSLABEL:
> return btrfs_ioctl_set_fslabel(file, argp);
> +#ifdef CONFIG_BTRFS_DEBUG
> case FS_IOC_SET_ENCRYPTION_POLICY: {
> if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
> return -EOPNOTSUPP;
> @@ -4601,6 +4602,7 @@ long btrfs_ioctl(struct file *file, unsigned int
> return fscrypt_ioctl_get_key_status(file, (void __user *)arg);
> case FS_IOC_GET_ENCRYPTION_NONCE:
> return fscrypt_ioctl_get_nonce(file, (void __user *)arg);
> +#endif /* CONFIG_BTRFS_DEBUG */
This diff doesn't seem to match the commit message.
BTW, only semi-related, but BTRFS_FS should select FS_ENCRYPTION_ALGS if
FS_ENCRYPTION.
- Eric
