summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch')
-rw-r--r--target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch b/target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch
new file mode 100644
index 0000000000..cbcacd43eb
--- /dev/null
+++ b/target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch
@@ -0,0 +1,54 @@
+From dccbc9197d2c3614f2fd6811874e1d982e4415f0 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Tue, 19 Jul 2016 00:26:55 +0200
+Subject: [PATCH] ubifs: Silence early error messages if MS_SILENT is set
+
+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.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+---
+ fs/ubifs/super.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- a/fs/ubifs/super.c
++++ b/fs/ubifs/super.c
+@@ -516,19 +516,19 @@ static int init_constants_early(struct u
+ 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;
+ }
+
+@@ -539,8 +539,8 @@ static int init_constants_early(struct u
+ 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;
+ }
+