diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2016-06-18 18:34:22 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2016-06-18 19:14:05 +0200 |
| commit | 67475b0e319359f6a3d0a925568665923e46b14d (patch) | |
| tree | 44942b8f980451654ae03434ccfdbd96d6e46256 /target/linux/generic | |
| parent | 982108f7e5da6c79c70c035e26ac3bdf47a8e487 (diff) | |
| download | master-31e0f0ae-67475b0e319359f6a3d0a925568665923e46b14d.tar.gz master-31e0f0ae-67475b0e319359f6a3d0a925568665923e46b14d.tar.bz2 master-31e0f0ae-67475b0e319359f6a3d0a925568665923e46b14d.zip | |
kernel: backport cosmetic ubifs patch
Despite the MS_SILENT flag being set when probing for ubifs rootfs a
logline indicating an error is generated during boot:
UBIFS error (pid: 1): cannot open "ubi0:rootfs", error -19
This leads to confusion and there shouldn't be lines containing
the word 'error' twice in a bootlog if actually everything is fine
(just the rootfs happens to be something else than ubifs)
The patch added has been submitted and was accepted upstream, see:
http://lists.infradead.org/pipermail/linux-mtd/2016-June/068056.html
http://patchwork.ozlabs.org/patch/637491
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch b/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch new file mode 100644 index 0000000000..7c01d77a18 --- /dev/null +++ b/target/linux/generic/patches-4.4/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch @@ -0,0 +1,42 @@ +From 6da56ec248e48c9c78721f51528c178adec3b35b Mon Sep 17 00:00:00 2001 +In-Reply-To: <5765615E.5010409@nod.at> +References: <5765615E.5010409@nod.at> +From: Daniel Golle <daniel@makrotopia.org> +Date: Sat, 18 Jun 2016 11:42:52 +0200 +Subject: [PATCH] ubifs: silence error output if MS_SILENT is set +X-Patchwork-Id: 637491 +X-Patchwork-Delegate: richard.weinberger@gmail.com +To: linux-mtd@lists.infradead.org +Cc: Artem Bityutskiy <dedekind1@gmail.com>, + Richard Weinberger <richard.weinberger@gmail.com> + +This change completes +commit 90bea5a3f0bf680b87b90516f3c231997f4b8f3b +which already implements support for MS_SILENT except for that one +error message which is still being displayed despite MS_SILENT being +set. Suppress that error message as well in case MS_SILENT is set. + +Signed-off-by: Daniel Golle <daniel@makrotopia.org> +--- + fs/ubifs/super.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c +index 7034995..736dd58 100644 +--- a/fs/ubifs/super.c ++++ b/fs/ubifs/super.c +@@ -2108,8 +2108,9 @@ static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags, + */ + ubi = open_ubi(name, UBI_READONLY); + if (IS_ERR(ubi)) { +- pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d", +- current->pid, name, (int)PTR_ERR(ubi)); ++ if (!(flags & MS_SILENT)) ++ pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d", ++ current->pid, name, (int)PTR_ERR(ubi)); + return ERR_CAST(ubi); + } + +-- +2.8.3 + |