git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
fs
/
ubifs
/
compress.c
diff --git
a/fs/ubifs/compress.c
b/fs/ubifs/compress.c
index
11e4132
..
2bfa095
100644
(file)
--- a/
fs/ubifs/compress.c
+++ b/
fs/ubifs/compress.c
@@
-112,8
+112,7
@@
void ubifs_compress(const void *in_buf, int in_len, void *out_buf, int *out_len,
if (compr->comp_mutex)
mutex_unlock(compr->comp_mutex);
if (unlikely(err)) {
if (compr->comp_mutex)
mutex_unlock(compr->comp_mutex);
if (unlikely(err)) {
- ubifs_warn("cannot compress %d bytes, compressor %s, "
- "error %d, leave data uncompressed",
+ ubifs_warn("cannot compress %d bytes, compressor %s, error %d, leave data uncompressed",
in_len, compr->name, err);
goto no_compr;
}
in_len, compr->name, err);
goto no_compr;
}
@@
-176,8
+175,8
@@
int ubifs_decompress(const void *in_buf, int in_len, void *out_buf,
if (compr->decomp_mutex)
mutex_unlock(compr->decomp_mutex);
if (err)
if (compr->decomp_mutex)
mutex_unlock(compr->decomp_mutex);
if (err)
- ubifs_err("cannot decompress %d bytes, compressor %s,
"
-
"error %d",
in_len, compr->name, err);
+ ubifs_err("cannot decompress %d bytes, compressor %s,
error %d",
+ in_len, compr->name, err);
return err;
}
return err;
}