[RESEND PATCH] ovl: Use str_on_off() helper in ovl_show_options()

Thorsten Blum posted 1 patch 1 year ago
There is a newer version of this series
fs/overlayfs/params.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
[RESEND PATCH] ovl: Use str_on_off() helper in ovl_show_options()
Posted by Thorsten Blum 1 year ago
Remove hard-coded strings by using the str_on_off() helper function.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 fs/overlayfs/params.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
index 1115c22deca0..8a8bb336b40f 100644
--- a/fs/overlayfs/params.c
+++ b/fs/overlayfs/params.c
@@ -1053,17 +1053,16 @@ int ovl_show_options(struct seq_file *m, struct dentry *dentry)
 		seq_printf(m, ",redirect_dir=%s",
 			   ovl_redirect_mode(&ofs->config));
 	if (ofs->config.index != ovl_index_def)
-		seq_printf(m, ",index=%s", ofs->config.index ? "on" : "off");
+		seq_printf(m, ",index=%s", str_on_off(ofs->config.index));
 	if (ofs->config.uuid != ovl_uuid_def())
 		seq_printf(m, ",uuid=%s", ovl_uuid_mode(&ofs->config));
 	if (ofs->config.nfs_export != ovl_nfs_export_def)
-		seq_printf(m, ",nfs_export=%s", ofs->config.nfs_export ?
-						"on" : "off");
+		seq_printf(m, ",nfs_export=%s",
+			   str_on_off(ofs->config.nfs_export));
 	if (ofs->config.xino != ovl_xino_def() && !ovl_same_fs(ofs))
 		seq_printf(m, ",xino=%s", ovl_xino_mode(&ofs->config));
 	if (ofs->config.metacopy != ovl_metacopy_def)
-		seq_printf(m, ",metacopy=%s",
-			   ofs->config.metacopy ? "on" : "off");
+		seq_printf(m, ",metacopy=%s", str_on_off(ofs->config.metacopy));
 	if (ofs->config.ovl_volatile)
 		seq_puts(m, ",volatile");
 	if (ofs->config.userxattr)
-- 
2.48.0
Re: [RESEND PATCH] ovl: Use str_on_off() helper in ovl_show_options()
Posted by Amir Goldstein 1 year ago
On Fri, Jan 17, 2025 at 3:52 PM Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> Remove hard-coded strings by using the str_on_off() helper function.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---

Fine by me.
I do not have any patch queued for the next merge window,
but if Christian wants to pick this up via his vfs tree, I wouldn't mind.

Acked-by: Amir Goldstein <amir73il@gmail.com>

Thanks,
Amir.

>  fs/overlayfs/params.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
> index 1115c22deca0..8a8bb336b40f 100644
> --- a/fs/overlayfs/params.c
> +++ b/fs/overlayfs/params.c
> @@ -1053,17 +1053,16 @@ int ovl_show_options(struct seq_file *m, struct dentry *dentry)
>                 seq_printf(m, ",redirect_dir=%s",
>                            ovl_redirect_mode(&ofs->config));
>         if (ofs->config.index != ovl_index_def)
> -               seq_printf(m, ",index=%s", ofs->config.index ? "on" : "off");
> +               seq_printf(m, ",index=%s", str_on_off(ofs->config.index));
>         if (ofs->config.uuid != ovl_uuid_def())
>                 seq_printf(m, ",uuid=%s", ovl_uuid_mode(&ofs->config));
>         if (ofs->config.nfs_export != ovl_nfs_export_def)
> -               seq_printf(m, ",nfs_export=%s", ofs->config.nfs_export ?
> -                                               "on" : "off");
> +               seq_printf(m, ",nfs_export=%s",
> +                          str_on_off(ofs->config.nfs_export));
>         if (ofs->config.xino != ovl_xino_def() && !ovl_same_fs(ofs))
>                 seq_printf(m, ",xino=%s", ovl_xino_mode(&ofs->config));
>         if (ofs->config.metacopy != ovl_metacopy_def)
> -               seq_printf(m, ",metacopy=%s",
> -                          ofs->config.metacopy ? "on" : "off");
> +               seq_printf(m, ",metacopy=%s", str_on_off(ofs->config.metacopy));
>         if (ofs->config.ovl_volatile)
>                 seq_puts(m, ",volatile");
>         if (ofs->config.userxattr)
> --
> 2.48.0
>