a0c49ef46f
Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
29 lines
800 B
Diff
29 lines
800 B
Diff
--- 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(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);
|
|
|