diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-04-04 11:18:27 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-04-04 11:19:33 +0200 |
| commit | ebed4b6dd066499d99089c4fb09cf8fddd199045 (patch) | |
| tree | 4c6c31ecd4fdebd1b206f9af19b3d1da4e5dfe29 /target/linux/generic/pending-4.14 | |
| parent | 9a92af46248ed885fd378dd566e55f88dcef3ea0 (diff) | |
| download | upstream-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/linux/generic/pending-4.14')
| -rw-r--r-- | target/linux/generic/pending-4.14/551-ubifs-fix-default-compression-selection.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/generic/pending-4.14/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/pending-4.14/551-ubifs-fix-default-compression-selection.patch deleted file mode 100644 index 4782fc9ed8..0000000000 --- a/target/linux/generic/pending-4.14/551-ubifs-fix-default-compression-selection.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Gabor Juhos <juhosg@openwrt.org> -Subject: fs: ubifs: fix default compression selection in ubifs - -Signed-off-by: Gabor Juhos <juhosg@openwrt.org> ---- - fs/ubifs/sb.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/fs/ubifs/sb.c -+++ b/fs/ubifs/sb.c -@@ -63,6 +63,17 @@ - /* Default time granularity in nanoseconds */ - #define DEFAULT_TIME_GRAN 1000000000 - -+static int get_default_compressor(void) -+{ -+ if (ubifs_compr_present(UBIFS_COMPR_LZO)) -+ return UBIFS_COMPR_LZO; -+ -+ if (ubifs_compr_present(UBIFS_COMPR_ZLIB)) -+ return UBIFS_COMPR_ZLIB; -+ -+ return UBIFS_COMPR_NONE; -+} -+ - /** - * create_default_filesystem - format empty UBI volume. - * @c: UBIFS file-system description object -@@ -186,7 +197,7 @@ static int create_default_filesystem(str - if (c->mount_opts.override_compr) - sup->default_compr = cpu_to_le16(c->mount_opts.compr_type); - else -- sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO); -+ sup->default_compr = cpu_to_le16(get_default_compressor()); - - generate_random_uuid(sup->uuid); - |