target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch

   1 From de2bc135f26a784ea8a83ee8b3458aa599f91ec0 Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Mon, 18 Jul 2016 23:26:17 +0200
   4 Subject: [PATCH] ubifs: silence another error if MS_SILENT is set
   5 To: linux-mtd@lists.infradead.org
   6 Cc: Artem Bityutskiy <dedekind1@gmail.com>,
   7     Richard Weinberger <richard.weinberger@gmail.com>
   8
   9 Probe-mounting a volume too small for UBIFS results in kernel log
  10 polution which might irritate users.
  11 Address this by silencing errors which may happen during boot if the
  12 rootfs is e.g. squashfs (and thus rather small) stored on a UBI volume.
  13 This commit should be seen in context with
  14 commit 65fb47721925628bf85ec08c4302ac5e7224a66a
  15 and
  16 commit 90bea5a3f0bf680b87b90516f3c231997f4b8f3b
  17
  18 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  19 ---
  20  fs/ubifs/super.c | 14 +++++++-------
  21  1 file changed, 7 insertions(+), 7 deletions(-)
  22
  23 --- a/fs/ubifs/super.c
  24 +++ b/fs/ubifs/super.c
  25 @@ -520,19 +520,19 @@ static int init_constants_early(struct u
  26         c->max_write_shift = fls(c->max_write_size) - 1;
  27
  28         if (c->leb_size < UBIFS_MIN_LEB_SZ) {
  29 -               ubifs_err(c, "too small LEBs (%d bytes), min. is %d bytes",
  30 -                         c->leb_size, UBIFS_MIN_LEB_SZ);
  31 +               ubifs_errc(c, "too small LEBs (%d bytes), min. is %d bytes",
  32 +                          c->leb_size, UBIFS_MIN_LEB_SZ);
  33                 return -EINVAL;
  34         }
  35
  36         if (c->leb_cnt < UBIFS_MIN_LEB_CNT) {
  37 -               ubifs_err(c, "too few LEBs (%d), min. is %d",
  38 -                         c->leb_cnt, UBIFS_MIN_LEB_CNT);
  39 +               ubifs_errc(c, "too few LEBs (%d), min. is %d",
  40 +                          c->leb_cnt, UBIFS_MIN_LEB_CNT);
  41                 return -EINVAL;
  42         }
  43
  44         if (!is_power_of_2(c->min_io_size)) {
  45 -               ubifs_err(c, "bad min. I/O size %d", c->min_io_size);
  46 +               ubifs_errc(c, "bad min. I/O size %d", c->min_io_size);
  47                 return -EINVAL;
  48         }
  49
  50 @@ -543,8 +543,8 @@ static int init_constants_early(struct u
  51         if (c->max_write_size < c->min_io_size ||
  52             c->max_write_size % c->min_io_size ||
  53             !is_power_of_2(c->max_write_size)) {
  54 -               ubifs_err(c, "bad write buffer size %d for %d min. I/O unit",
  55 -                         c->max_write_size, c->min_io_size);
  56 +               ubifs_errc(c, "bad write buffer size %d for %d min. I/O unit",
  57 +                          c->max_write_size, c->min_io_size);
  58                 return -EINVAL;
  59         }
  60