diff options
Diffstat (limited to 'target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch')
| -rw-r--r-- | target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch new file mode 100644 index 0000000000..ed0b7df5ee --- /dev/null +++ b/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch @@ -0,0 +1,42 @@ +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(-) + +diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c +index 3cbb904a6d7d..460cb9e3b4ea 100644 +--- 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 +@@ -183,7 +194,7 @@ static int create_default_filesystem(struct ubifs_info *c) + 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); + +-- +2.11.0 + |