diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-29 21:32:22 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-29 21:32:22 +0000 |
| commit | 5a2aa8f184ecc8544832764e8b21f6eafd3a68bc (patch) | |
| tree | 3f22b4816b39f586d0588c95caccb96fbe05ee97 /target/linux | |
| parent | da9a704e9278a6df7586566f5891aaee4d04f0e3 (diff) | |
| download | upstream-5a2aa8f184ecc8544832764e8b21f6eafd3a68bc.tar.gz upstream-5a2aa8f184ecc8544832764e8b21f6eafd3a68bc.tar.bz2 upstream-5a2aa8f184ecc8544832764e8b21f6eafd3a68bc.zip | |
generic: fix default compression selection in ubifs
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35398
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-3.7/551-ubifs-fix-default-compression-selection.patch | 29 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.8/551-ubifs-fix-default-compression-selection.patch | 29 |
2 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/patches-3.7/551-ubifs-fix-default-compression-selection.patch new file mode 100644 index 0000000000..1b0f30718c --- /dev/null +++ b/target/linux/generic/patches-3.7/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); + diff --git a/target/linux/generic/patches-3.8/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/patches-3.8/551-ubifs-fix-default-compression-selection.patch new file mode 100644 index 0000000000..1b0f30718c --- /dev/null +++ b/target/linux/generic/patches-3.8/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); + |