@@ -20,25 +20,20 @@
* Zoltan Sogor
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
+#include "ubifs_common.h"
+
#ifndef WITHOUT_LZO
#include <lzo/lzo1x.h>
#endif
-#include <linux/types.h>
#define crc32 __zlib_crc32
#include <zlib.h>
#undef crc32
#include "compr.h"
-#include "mkfs.ubifs.h"
static void *lzo_mem;
static unsigned long long errcnt = 0;
-static struct ubifs_info *c = &info_;
#define DEFLATE_DEF_LEVEL Z_DEFAULT_COMPRESSION
#define DEFLATE_DEF_WINBITS 11
@@ -119,7 +114,7 @@ static char *zlib_buf;
#ifndef WITHOUT_LZO
static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf,
- size_t *out_len, int *type)
+ size_t *out_len, int *type, int lzo_percent)
{
int lzo_ret, zlib_ret;
size_t lzo_len, zlib_len;
@@ -141,7 +136,7 @@ static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf,
percent = (double)zlib_len / (double)lzo_len;
percent *= 100;
- if (percent > 100 - c->favor_percent)
+ if (percent > 100 - lzo_percent)
goto select_lzo;
goto select_zlib;
}
@@ -165,8 +160,8 @@ select_zlib:
}
#endif
-int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
- int type)
+int compress_data(void *in_buf, size_t in_len, void *out_buf,
+ size_t *out_len, int type, int lzo_percent)
{
int ret;
@@ -179,8 +174,8 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
{
switch (type) {
#else
- if (c->favor_lzo)
- ret = favor_lzo_compress(in_buf, in_len, out_buf, out_len, &type);
+ if (lzo_percent)
+ ret = favor_lzo_compress(in_buf, in_len, out_buf, out_len, &type, lzo_percent);
else {
switch (type) {
case MKFS_UBIFS_COMPR_LZO:
@@ -38,8 +38,7 @@ enum compression_type
MKFS_UBIFS_COMPR_ZLIB,
};
-int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
- int type);
+int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len, int type, int lzo_percent);
int init_compression(void);
void destroy_compression(void);
@@ -1455,8 +1455,12 @@ static int add_file(const char *path_name, struct stat *st, ino_t inum,
#endif
else
use_compr = c->default_compr;
- compr_type = compress_data(buf, bytes_read, &dn->data,
- &out_len, use_compr);
+ if (c->favor_lzo)
+ compr_type = compress_data(buf, bytes_read, &dn->data,
+ &out_len, use_compr, c->favor_percent);
+ else
+ compr_type = compress_data(buf, bytes_read, &dn->data,
+ &out_len, use_compr, 0);
dn->compr_type = cpu_to_le16(compr_type);
dn_len = UBIFS_DATA_NODE_SZ + out_len;
/* Add data node to file system */
remove the including of mkfs.ubifs.h in compr lib and drop the reference of globle variable info_ from compr to mkfs.ubifs. Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> --- ubifs-utils/mkfs.ubifs/compr.c | 21 ++++++++------------- ubifs-utils/mkfs.ubifs/compr.h | 3 +-- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 8 ++++++-- 3 files changed, 15 insertions(+), 17 deletions(-)