* [PATCH] cifs: warn and fail if trying to use rootfs without the config option
@ 2021-03-18 18:17 Aurélien Aptel
2021-03-19 5:52 ` Steve French
0 siblings, 1 reply; 2+ messages in thread
From: Aurélien Aptel @ 2021-03-18 18:17 UTC (permalink / raw)
To: linux-cifs; +Cc: smfrench, Aurelien Aptel
From: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cifs: warn and fail if trying to use rootfs without the config option
2021-03-18 18:17 [PATCH] cifs: warn and fail if trying to use rootfs without the config option Aurélien Aptel
@ 2021-03-19 5:52 ` Steve French
0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2021-03-19 5:52 UTC (permalink / raw)
To: Aurélien Aptel; +Cc: CIFS
merged into cifs-2.6.git for-next
On Thu, Mar 18, 2021 at 1:17 PM Aurélien Aptel <aaptel@suse.com> wrote:
>
> From: Aurelien Aptel <aaptel@suse.com>
>
> Signed-off-by: Aurelien Aptel <aaptel@suse.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-19 5:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-18 18:17 [PATCH] cifs: warn and fail if trying to use rootfs without the config option Aurélien Aptel
2021-03-19 5:52 ` Steve French
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.