aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2013-10-24 13:50:11 +0000
committerImre Kaloz <kaloz@openwrt.org>2013-10-24 13:50:11 +0000
commitbdc2e671912c3737ec65454cc7a5ed91213f7e01 (patch)
tree4613cca2c570d5eefc520620ba3bac85f7015a4b /target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch
parentbf6998b89de06eae7f3fb8cecd43482d6cb15afb (diff)
downloadmaster-187ad058-bdc2e671912c3737ec65454cc7a5ed91213f7e01.tar.gz
master-187ad058-bdc2e671912c3737ec65454cc7a5ed91213f7e01.tar.bz2
master-187ad058-bdc2e671912c3737ec65454cc7a5ed91213f7e01.zip
[generic:] preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38528 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch')
-rw-r--r--target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch
new file mode 100644
index 0000000000..1b0f30718c
--- /dev/null
+++ b/target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch
@@ -0,0 +1,29 @@
+--- 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);
+