lkml.org 
[lkml]   [2019]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 1/2] ubifs: Use correct config name for encryption
On Tue, May 14, 2019 at 9:11 PM Richard Weinberger <richard@nod.at> wrote:
>
> CONFIG_UBIFS_FS_ENCRYPTION is gone, fscrypt is now
> controlled via CONFIG_FS_ENCRYPTION.
> This problem slipped into the tree because of a mis-merge on
> my side.
>
> Reported-by: Eric Biggers <ebiggers@kernel.org>
> Fixes: eea2c05d927b ("ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION")
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> fs/ubifs/sb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
> index 2afc8b1d4c3b..3ca41965db6e 100644
> --- a/fs/ubifs/sb.c
> +++ b/fs/ubifs/sb.c
> @@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c)
> goto out;
> }
>
> - if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) && c->encrypted) {
> + if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) && c->encrypted) {
> ubifs_err(c, "file system contains encrypted files but UBIFS"
> " was built without crypto support.");
> err = -EINVAL;
> @@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c)
> int err;
> struct ubifs_sb_node *sup = c->sup_node;
>
> - if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION))
> + if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
> return -EOPNOTSUPP;
>
> if (c->encrypted)
> --
> 2.16.4

Applied both.

--
Thanks,
//richard

\
 
 \ /
  Last update: 2019-05-15 21:55    [W:0.035 / U:20.456 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site