[source] kernel: backport yet another cosmetic ubifs patch

[LEDE Commits]

dangole pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=fc90851df0810bf49283ed238a58641a819402bd

commit fc90851df0810bf49283ed238a58641a819402bd
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Tue Jul 19 00:27:59 2016 +0200

    kernel: backport yet another cosmetic ubifs patch
    
    On UBI-enabled devices using squashfs as their rootfs an error
    message like
    UBIFS error (ubi0:3 pid 1): init_constants_early: too few LEBs (12), min. is 17
    was thrown while probe-mounting the rootfs which later on succeeds and
    thus shouldn't alert the user.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 ...silence-another-error-if-MS_SILENT-is-set.patch | 65 ++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch b/target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch
new file mode 100644
index 0000000..290a7d6
--- /dev/null
+++ b/target/linux/generic/patches-4.4/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch
@@ -0,0 +1,65 @@
+From de2bc135f26a784ea8a83ee8b3458aa599f91ec0 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel at makrotopia.org>
+Date: Mon, 18 Jul 2016 23:26:17 +0200
+Subject: [PATCH] ubifs: silence another error if MS_SILENT is set
+To: linux-mtd at lists.infradead.org
+Cc: Artem Bityutskiy <dedekind1 at gmail.com>,
+    Richard Weinberger <richard.weinberger at gmail.com>
+
+Probe-mounting a volume too small for UBIFS results in kernel log
+polution which might irritate users.
+Address this by silencing errors which may happen during boot if the
+rootfs is e.g. squashfs (and thus rather small) stored on a UBI volume.
+This commit should be seen in context with
+commit 65fb47721925628bf85ec08c4302ac5e7224a66a
+and
+commit 90bea5a3f0bf680b87b90516f3c231997f4b8f3b
+
+Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+---
+ fs/ubifs/super.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
+index 736dd58..4ec0510 100644
+--- a/fs/ubifs/super.c
++++ b/fs/ubifs/super.c
+@@ -520,19 +520,19 @@ static int init_constants_early(struct ubifs_info *c)
+ 	c->max_write_shift = fls(c->max_write_size) - 1;
+ 
+ 	if (c->leb_size < UBIFS_MIN_LEB_SZ) {
+-		ubifs_err(c, "too small LEBs (%d bytes), min. is %d bytes",
+-			  c->leb_size, UBIFS_MIN_LEB_SZ);
++		ubifs_errc(c, "too small LEBs (%d bytes), min. is %d bytes",
++			   c->leb_size, UBIFS_MIN_LEB_SZ);
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (c->leb_cnt < UBIFS_MIN_LEB_CNT) {
+-		ubifs_err(c, "too few LEBs (%d), min. is %d",
+-			  c->leb_cnt, UBIFS_MIN_LEB_CNT);
++		ubifs_errc(c, "too few LEBs (%d), min. is %d",
++			   c->leb_cnt, UBIFS_MIN_LEB_CNT);
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (!is_power_of_2(c->min_io_size)) {
+-		ubifs_err(c, "bad min. I/O size %d", c->min_io_size);
++		ubifs_errc(c, "bad min. I/O size %d", c->min_io_size);
+ 		return -EINVAL;
+ 	}
+ 
+@@ -543,8 +543,8 @@ static int init_constants_early(struct ubifs_info *c)
+ 	if (c->max_write_size < c->min_io_size ||
+ 	    c->max_write_size % c->min_io_size ||
+ 	    !is_power_of_2(c->max_write_size)) {
+-		ubifs_err(c, "bad write buffer size %d for %d min. I/O unit",
+-			  c->max_write_size, c->min_io_size);
++		ubifs_errc(c, "bad write buffer size %d for %d min. I/O unit",
++			   c->max_write_size, c->min_io_size);
+ 		return -EINVAL;
+ 	}
+ 
+-- 
+2.9.0
+