diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
| commit | 2b43bb49dec4546cdca7e627b06e7682ae742591 (patch) | |
| tree | 0d58c3ccdefbe53983cda5399612b4727f0ee81d /target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch | |
| parent | 3be7023c9be4e1381699ce393638ad63565c9ac5 (diff) | |
| download | master-187ad058-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.gz master-187ad058-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.bz2 master-187ad058-2b43bb49dec4546cdca7e627b06e7682ae742591.zip | |
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch new file mode 100644 index 0000000000..1b0f30718c --- /dev/null +++ b/target/linux/generic/patches-3.14/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); + |