Patchwork UBIFS: cosmetic: correct mount message

login
register
mail settings
Submitter Richard Genoud
Date April 2, 2013, 10:24 a.m.
Message ID <1364898277-30146-1-git-send-email-richard.genoud@gmail.com>
Download mbox | patch
Permalink /patch/232940/
State Accepted
Commit beadadfa5467e09e36891f39cae1f5d8d3bbf17e
Headers show

Comments

Richard Genoud - April 2, 2013, 10:24 a.m.
When mounting an UBIFS R/W volume, we have the message:
UBIFS: mounted UBI device 0, volume 1, name "rootfs"(null)
With this patch, we'll have:
UBIFS: mounted UBI device 0, volume 1, name "rootfs"
Which is, I think, what was intended.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
 fs/ubifs/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Artem Bityutskiy - May 10, 2013, 2:09 p.m.
On Tue, 2013-04-02 at 12:24 +0200, Richard Genoud wrote:
> When mounting an UBIFS R/W volume, we have the message:
> UBIFS: mounted UBI device 0, volume 1, name "rootfs"(null)
> With this patch, we'll have:
> UBIFS: mounted UBI device 0, volume 1, name "rootfs"
> Which is, I think, what was intended.
> 
> Signed-off-by: Richard Genoud <richard.genoud@gmail.com>

Although this is consmetic, I think it deserves to be added to the
stable kernels, so I pushed this to linux-ubifs.git and added

Cc: stable@vger.kernel.org [v3.7+]

Patch

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index ac838b8..d03ead8 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1412,7 +1412,7 @@  static int mount_ubifs(struct ubifs_info *c)
 
 	ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"%s",
 		  c->vi.ubi_num, c->vi.vol_id, c->vi.name,
-		  c->ro_mount ? ", R/O mode" : NULL);
+		  c->ro_mount ? ", R/O mode" : "");
 	x = (long long)c->main_lebs * c->leb_size;
 	y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
 	ubifs_msg("LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",