From 4c0d7487de7df9e96cb0a3d5d5d75e71c566c52b Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 7 Aug 2009 13:51:33 -0400
Subject: [PATCH] --- yaml --- r: 156511 b: refs/heads/master c:
 60f2e8f8a07331097a57ec4abcdc680405579377 h: refs/heads/master i:   156509:
 9f46f38b316c329f6d5e6b46fe02e84ac6a3ac53   156507:
 6e4d146520df3ab81a672e9844ebaa7d7e294724   156503:
 bb4f5b455106d67812169d00a6a818c0e22f8970   156495:
 8835c322b5ef1c315f1109930444788592f6a1a0   156479:
 8f404289907c53178ac4a11d0d4b1b314a163a57 v: v3

---
 [refs]                | 2 +-
 trunk/fs/btrfs/zlib.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 374f095bb58e..2348f8c2c674 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4baf8c9201e88546918cbfa61ea8062c38bc1644
+refs/heads/master: 60f2e8f8a07331097a57ec4abcdc680405579377
diff --git a/trunk/fs/btrfs/zlib.c b/trunk/fs/btrfs/zlib.c
index ecfbce836d32..3e2b90eaa239 100644
--- a/trunk/fs/btrfs/zlib.c
+++ b/trunk/fs/btrfs/zlib.c
@@ -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)) {
@@ -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]);
@@ -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;