aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-04-04 11:18:27 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-04-04 11:19:33 +0200
commitebed4b6dd066499d99089c4fb09cf8fddd199045 (patch)
tree4c6c31ecd4fdebd1b206f9af19b3d1da4e5dfe29 /target
parent9a92af46248ed885fd378dd566e55f88dcef3ea0 (diff)
downloadupstream-ebed4b6dd066499d99089c4fb09cf8fddd199045.tar.gz
upstream-ebed4b6dd066499d99089c4fb09cf8fddd199045.tar.bz2
upstream-ebed4b6dd066499d99089c4fb09cf8fddd199045.zip
kernel: backport upstream ubifs default compression selection fix
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/backport-4.14/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch (renamed from target/linux/generic/pending-4.14/551-ubifs-fix-default-compression-selection.patch)0
-rw-r--r--target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch (renamed from target/linux/generic/pending-4.19/551-ubifs-fix-default-compression-selection.patch)11
2 files changed, 10 insertions, 1 deletions
diff --git a/target/linux/generic/pending-4.14/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/backport-4.14/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch
index 4782fc9ed8..4782fc9ed8 100644
--- a/target/linux/generic/pending-4.14/551-ubifs-fix-default-compression-selection.patch
+++ b/target/linux/generic/backport-4.14/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch
diff --git a/target/linux/generic/pending-4.19/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch
index 60d5619989..7bd3ed9fad 100644
--- a/target/linux/generic/pending-4.19/551-ubifs-fix-default-compression-selection.patch
+++ b/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch
@@ -1,7 +1,16 @@
+From d62e98ed1efcaa94caa004f622944afdce5f1c3c Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
-Subject: fs: ubifs: fix default compression selection in ubifs
+Date: Sun, 9 Dec 2018 18:12:13 +0100
+Subject: [PATCH] ubifs: Fix default compression selection in ubifs
+
+When ubifs is build without the LZO compressor and no compressor is
+given the creation of the default file system will fail. before
+selection the LZO compressor check if it is present and if not fall back
+to the zlib or none.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/ubifs/sb.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)