summaryrefslogtreecommitdiff
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
commite72c7e17a475c00134c56f4392578ddc16a47a2e (patch)
tree842835f958f9c9ed315cb853173d51e43f76bbf5 /target/linux/generic/patches-3.12/551-ubifs-fix-default-compression-selection.patch
parent4341ea40379ed24c103e37b75661c62bfc3270f6 (diff)
downloadmtk-20170518-e72c7e17a475c00134c56f4392578ddc16a47a2e.zip
mtk-20170518-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.gz
mtk-20170518-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.bz2
preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 38528
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 0000000..1b0f307
--- /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);
+