Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190514191050.13181-1-richard@nod.at>
In-Reply-To: <20190514191050.13181-1-richard@nod.at>
From:   Richard Weinberger <richard.weinberger@gmail.com>
Date:   Wed, 15 May 2019 21:54:51 +0200
Message-ID: <CAFLxGvz1OAbqj=Hf4dyJ2SuUJjYCj2KMFhj-9nVE3mQzNoKH2A@mail.gmail.com>
Subject: Re: [PATCH 1/2] ubifs: Use correct config name for encryption
To:     Richard Weinberger <richard@nod.at>
Cc:     linux-mtd@lists.infradead.org, LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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