UBIFS: comply with coding style

Join all the split printk lines in order to stop checkpatch complaining.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

1 files changed, 8 insertions, 11 deletions

diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index 15e2fc5aa60b..5b7bfa29ec37 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -391,9 +391,8 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup)
         min_leb_cnt += c->lpt_lebs + c->orph_lebs + c->jhead_cnt + 6;
 
         if (c->leb_cnt < min_leb_cnt || c->leb_cnt > c->vi.size) {
-                ubifs_err("bad LEB count: %d in superblock, %d on UBI volume, "
-                          "%d minimum required", c->leb_cnt, c->vi.size,
-                          min_leb_cnt);
+                ubifs_err("bad LEB count: %d in superblock, %d on UBI volume, %d minimum required",
+                          c->leb_cnt, c->vi.size, min_leb_cnt);
                 goto failed;
         }
 
@@ -411,15 +410,14 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup)
 
         max_bytes = (long long)c->leb_size * UBIFS_MIN_BUD_LEBS;
         if (c->max_bud_bytes < max_bytes) {
-                ubifs_err("too small journal (%lld bytes), must be at least "
-                          "%lld bytes",  c->max_bud_bytes, max_bytes);
+                ubifs_err("too small journal (%lld bytes), must be at least %lld bytes",
+                          c->max_bud_bytes, max_bytes);
                 goto failed;
         }
 
         max_bytes = (long long)c->leb_size * c->main_lebs;
         if (c->max_bud_bytes > max_bytes) {
-                ubifs_err("too large journal size (%lld bytes), only %lld bytes"
-                          "available in the main area",
+                ubifs_err("too large journal size (%lld bytes), only %lld bytes available in the main area",
                           c->max_bud_bytes, max_bytes);
                 goto failed;
         }
@@ -549,10 +547,9 @@ int ubifs_read_superblock(struct ubifs_info *c)
                 ubifs_assert(!c->ro_media || c->ro_mount);
                 if (!c->ro_mount ||
                     c->ro_compat_version > UBIFS_RO_COMPAT_VERSION) {
-                        ubifs_err("on-flash format version is w%d/r%d, but "
-                                  "software only supports up to version "
-                                  "w%d/r%d", c->fmt_version,
-                                  c->ro_compat_version, UBIFS_FORMAT_VERSION,
+                        ubifs_err("on-flash format version is w%d/r%d, but software only supports up to version w%d/r%d",
+                                  c->fmt_version, c->ro_compat_version,
+                                  UBIFS_FORMAT_VERSION,
                                   UBIFS_RO_COMPAT_VERSION);
                         if (c->ro_compat_version <= UBIFS_RO_COMPAT_VERSION) {
                                 ubifs_msg("only R/O mounting is possible");