[PATCH V4 6/6] fs: befs: Coalesce format in log messages

From: Salah Triki
Date: Wed May 25 2016 - 21:42:29 EST


Coalese format is more readable, even if it goes over 80 column width,
so group format snippets together.

Signed-off-by: Salah Triki <salah.triki@xxxxxxx>
---
fs/befs/linuxvfs.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index c734f21..74b377a 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -683,8 +683,7 @@ parse_options(char *options, struct befs_mount_options *opts)
if (option >= 0)
uid = make_kuid(current_user_ns(), option);
if (!uid_valid(uid)) {
- pr_err("Invalid uid %d, "
- "using default\n", option);
+ pr_err("Invalid uid %d, using default\n", option);
break;
}
opts->uid = uid;
@@ -697,8 +696,7 @@ parse_options(char *options, struct befs_mount_options *opts)
if (option >= 0)
gid = make_kgid(current_user_ns(), option);
if (!gid_valid(gid)) {
- pr_err("Invalid gid %d, "
- "using default\n", option);
+ pr_err("Invalid gid %d, using default\n", option);
break;
}
opts->gid = gid;
@@ -708,8 +706,7 @@ parse_options(char *options, struct befs_mount_options *opts)
kfree(opts->iocharset);
opts->iocharset = match_strdup(&args[0]);
if (!opts->iocharset) {
- pr_err("allocation failure for "
- "iocharset string\n");
+ pr_err("allocation failure for iocharset string\n");
return 0;
}
break;
@@ -717,8 +714,7 @@ parse_options(char *options, struct befs_mount_options *opts)
opts->debug = 1;
break;
default:
- pr_err("Unrecognized mount option \"%s\" "
- "or missing value\n", p);
+ pr_err("Unrecognized mount option \"%s\" or missing value\n", p);
return 0;
}
}
@@ -774,8 +770,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
befs_debug(sb, "---> %s", __func__);

if (!(sb->s_flags & MS_RDONLY)) {
- befs_warning(sb,
- "No write support. Marking filesystem read-only");
+ befs_warning(sb, "No write support. Marking filesystem read-only");
sb->s_flags |= MS_RDONLY;
}

@@ -844,12 +839,10 @@ befs_fill_super(struct super_block *sb, void *data, int silent)

/* load nls library */
if (befs_sb->mount_opts.iocharset) {
- befs_debug(sb, "Loading nls: %s",
- befs_sb->mount_opts.iocharset);
+ befs_debug(sb, "Loading nls: %s", befs_sb->mount_opts.iocharset);
befs_sb->nls = load_nls(befs_sb->mount_opts.iocharset);
if (!befs_sb->nls) {
- befs_warning(sb, "Cannot load nls %s"
- " loading default nls",
+ befs_warning(sb, "Cannot load nls %s loading default nls",
befs_sb->mount_opts.iocharset);
befs_sb->nls = load_nls_default();
}
--
1.9.1