merged into cifs-2.6.git for-next
On Thu, Mar 18, 2021 at 1:17 PM Aurélien Aptel <aaptel@xxxxxxxx> wrote:
>
> From: Aurelien Aptel <aaptel@xxxxxxxx>
>
> Signed-off-by: Aurelien Aptel <aaptel@xxxxxxxx>
> ---
> fs/cifs/fs_context.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c
> index 9b0e82bc584f..d0580e2d1f32 100644
> --- a/fs/cifs/fs_context.c
> +++ b/fs/cifs/fs_context.c
> @@ -1197,9 +1197,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
> pr_warn_once("Witness protocol support is experimental\n");
> break;
> case Opt_rootfs:
> -#ifdef CONFIG_CIFS_ROOT
> - ctx->rootfs = true;
> +#ifndef CONFIG_CIFS_ROOT
> + cifs_dbg(VFS, "rootfs support requires CONFIG_CIFS_ROOT config option\n");
> + goto cifs_parse_mount_err;
> #endif
> + ctx->rootfs = true;
> break;
> case Opt_posixpaths:
> if (result.negated)
> --
> 2.30.0
>
--
Thanks,
Steve
