2013-07-22 22:24:28

by Jóhann B. Guðmundsson

Subject: [PATCH 1/1] ext4: Fix Opts: (null)

null null null no more Opts: (null) but something that actually makes sense to
human beings...

Signed-off-by: Jóhann B. Guðmundsson <[email protected]>
---
fs/ext4/super.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 85b3dd6..ef141b7 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4088,8 +4088,8 @@ no_journal:
"the device does not support discard");
}

- ext4_msg(sb, KERN_INFO, "mounted filesystem with%s. "
- "Opts: %s%s%s", descr, sbi->s_es->s_mount_opts,
+ ext4_msg(sb, KERN_INFO, "mounted filesystem with%s "
+ "%s%s%s mount option(s)", descr, sbi->s_es->s_mount_opts,
*sbi->s_es->s_mount_opts ? "; " : "", orig_data);

if (es->s_error_count)
@@ -4866,7 +4866,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
}
#endif

- ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
+ ext4_msg(sb, KERN_INFO, "re-mounted %s mount option(s)", orig_data);
kfree(orig_data);
return 0;

--
1.8.1.4

2013-07-24 02:19:02

by Eric Sandeen

Subject: Re: [PATCH 1/1] ext4: Fix Opts: (null)

On 7/22/13 5:24 PM, Jóhann B. Guðmundsson wrote:
> null null null no more Opts: (null) but something that actually makes sense to
> human beings...

It's not clear to me how this changes the (null) output...
Have you tested it? What's the difference in output?

-Eric

> Signed-off-by: Jóhann B. Guðmundsson <[email protected]>
> ---
> fs/ext4/super.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 85b3dd6..ef141b7 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -4088,8 +4088,8 @@ no_journal:
> "the device does not support discard");
> }
>
> - ext4_msg(sb, KERN_INFO, "mounted filesystem with%s. "
> - "Opts: %s%s%s", descr, sbi->s_es->s_mount_opts,
> + ext4_msg(sb, KERN_INFO, "mounted filesystem with%s "
> + "%s%s%s mount option(s)", descr, sbi->s_es->s_mount_opts,
> *sbi->s_es->s_mount_opts ? "; " : "", orig_data);
>
> if (es->s_error_count)
> @@ -4866,7 +4866,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
> }
> #endif
>
> - ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
> + ext4_msg(sb, KERN_INFO, "re-mounted %s mount option(s)", orig_data);

> kfree(orig_data);
> return 0;
>
>

2013-07-24 09:04:53

by Jóhann B. Guðmundsson

Subject: Re: [PATCH 1/1] ext4: Fix Opts: (null)

On 07/24/2013 02:18 AM, Eric Sandeen wrote:
> Have you tested it? What's the difference in output?


- ext4_msg(sb, KERN_INFO, "mounted filesystem with%s. "
- "Opts: %s%s%s", descr, sbi->s_es->s_mount_opts,
+ ext4_msg(sb, KERN_INFO, "mounted filesystem with%s "
+ "%s%s%s mount option(s)", descr, sbi->s_es->s_mount_opts,
*sbi->s_es->s_mount_opts ? "; " : "", orig_data);


From
mounted filesystem with Opts: (null)
re-mounted. Opts:(null)

To

mounted filesystem with (null) mount option(s)
re-mounted (null) mount option(s)

That (null) could change to no or none I suppose but it still feels a bit off thou maybe this output sample would be better?

if = (null)

mounted filesystem
re-mounted filesystem

elif

mounted filesystem with x,y.x mount option(s)
re-mounted filesystem with x,y.x mount option(s)

JBG