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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
fs
/
btrfs
/
zlib.c
diff --git
a/fs/btrfs/zlib.c
b/fs/btrfs/zlib.c
index
ecfbce8
..
3e2b90e
100644
(file)
--- a/
fs/btrfs/zlib.c
+++ b/
fs/btrfs/zlib.c
@@
-208,7
+208,7
@@
int btrfs_zlib_compress_pages(struct address_space *mapping,
*total_in = 0;
workspace = find_zlib_workspace();
*total_in = 0;
workspace = find_zlib_workspace();
- if (
!workspace
)
+ if (
IS_ERR(workspace)
)
return -1;
if (Z_OK != zlib_deflateInit(&workspace->def_strm, 3)) {
return -1;
if (Z_OK != zlib_deflateInit(&workspace->def_strm, 3)) {
@@
-366,7
+366,7
@@
int btrfs_zlib_decompress_biovec(struct page **pages_in,
char *kaddr;
workspace = find_zlib_workspace();
char *kaddr;
workspace = find_zlib_workspace();
- if (
!workspace
)
+ if (
IS_ERR(workspace)
)
return -ENOMEM;
data_in = kmap(pages_in[page_in_index]);
return -ENOMEM;
data_in = kmap(pages_in[page_in_index]);
@@
-547,7
+547,7
@@
int btrfs_zlib_decompress(unsigned char *data_in,
return -ENOMEM;
workspace = find_zlib_workspace();
return -ENOMEM;
workspace = find_zlib_workspace();
- if (
!workspace
)
+ if (
IS_ERR(workspace)
)
return -ENOMEM;
workspace->inf_strm.next_in = data_in;
return -ENOMEM;
workspace->inf_strm.next_in = data_in;