2023-07-03 11:47:45

by Arnd Bergmann

Subject: [PATCH] ovl: mark ovl_redirect_mode() as static again

From: Arnd Bergmann <[email protected]>

This function was moved to another file and is no longer marked
static there, causing a W=1 warning:

fs/overlayfs/params.c:92:13: error: no previous prototype for 'ovl_redirect_mode' [-Werror=missing-prototypes]

This was probably lost by accident during the refactoring, as there is
still no caller in another file, so add back the annotation.

Fixes: 06bcaa2dafb7e ("ovl: move all parameter handling into params.{c,h}")
Signed-off-by: Arnd Bergmann <[email protected]>
---
fs/overlayfs/params.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
index b8c2f6056a9a8..a63160dbb0f95 100644
--- a/fs/overlayfs/params.c
+++ b/fs/overlayfs/params.c
@@ -89,7 +89,7 @@ const struct constant_table ovl_parameter_redirect_dir[] = {
{}
};

-const char *ovl_redirect_mode(struct ovl_config *config)
+static const char *ovl_redirect_mode(struct ovl_config *config)
{
return ovl_parameter_redirect_dir[config->redirect_mode].name;
}
--
2.39.2

2023-07-03 13:23:32

by Amir Goldstein

Subject: Re: [PATCH] ovl: mark ovl_redirect_mode() as static again

On Mon, Jul 3, 2023 at 2:31 PM Arnd Bergmann <[email protected]> wrote:
>
> From: Arnd Bergmann <[email protected]>
>
> This function was moved to another file and is no longer marked
> static there, causing a W=1 warning:
>
> fs/overlayfs/params.c:92:13: error: no previous prototype for 'ovl_redirect_mode' [-Werror=missing-prototypes]
>
> This was probably lost by accident during the refactoring, as there is
> still no caller in another file, so add back the annotation.
>
> Fixes: 06bcaa2dafb7e ("ovl: move all parameter handling into params.{c,h}")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---

This is against a patch that is not upstream.
I will squash it.

Thanks,
Amir.

> fs/overlayfs/params.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
> index b8c2f6056a9a8..a63160dbb0f95 100644
> --- a/fs/overlayfs/params.c
> +++ b/fs/overlayfs/params.c
> @@ -89,7 +89,7 @@ const struct constant_table ovl_parameter_redirect_dir[] = {
> {}
> };
>
> -const char *ovl_redirect_mode(struct ovl_config *config)
> +static const char *ovl_redirect_mode(struct ovl_config *config)
> {
> return ovl_parameter_redirect_dir[config->redirect_mode].name;
> }
> --
> 2.39.2
>