mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
|
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);
|
||
|
|
|