Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 156511
b: refs/heads/master
c: 60f2e8f
h: refs/heads/master
i:
  156509: 9f46f38
  156507: 6e4d146
  156503: bb4f5b4
  156495: 8835c32
  156479: 8f40428
v: v3
  • Loading branch information
Julia Lawall authored and Chris Mason committed Aug 7, 2009
1 parent f5dcfbf commit 4c0d748
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4baf8c9201e88546918cbfa61ea8062c38bc1644
refs/heads/master: 60f2e8f8a07331097a57ec4abcdc680405579377
6 changes: 3 additions & 3 deletions trunk/fs/btrfs/zlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ int btrfs_zlib_compress_pages(struct address_space *mapping,
*total_in = 0;

workspace = find_zlib_workspace();
if (!workspace)
if (IS_ERR(workspace))
return -1;

if (Z_OK != zlib_deflateInit(&workspace->def_strm, 3)) {
Expand Down Expand Up @@ -366,7 +366,7 @@ int btrfs_zlib_decompress_biovec(struct page **pages_in,
char *kaddr;

workspace = find_zlib_workspace();
if (!workspace)
if (IS_ERR(workspace))
return -ENOMEM;

data_in = kmap(pages_in[page_in_index]);
Expand Down Expand Up @@ -547,7 +547,7 @@ int btrfs_zlib_decompress(unsigned char *data_in,
return -ENOMEM;

workspace = find_zlib_workspace();
if (!workspace)
if (IS_ERR(workspace))
return -ENOMEM;

workspace->inf_strm.next_in = data_in;
Expand Down

0 comments on commit 4c0d748

Please sign in to comment.