From ca7a3b42e420b5a7a7f9125a45ed04f486692807 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 9 Nov 2010 08:27:27 +0800
Subject: [PATCH] --- yaml --- r: 231747 b: refs/heads/master c:
 4b72029dc3fd6ba7dc45ccd1cf0aa0ebfa209bd3 h: refs/heads/master i:   231745:
 428aad4c037594a8058723911ffef8e484490093   231743:
 8d7b63e35a6fe48065ca2e12417326c3dc730c32 v: v3

---
 [refs]                | 2 +-
 trunk/fs/btrfs/zlib.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6c749445b1ee..03f7bb33a182 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8844355df7f4e091b03cc131e1549631238b397b
+refs/heads/master: 4b72029dc3fd6ba7dc45ccd1cf0aa0ebfa209bd3
diff --git a/trunk/fs/btrfs/zlib.c b/trunk/fs/btrfs/zlib.c
index e5b8b22e07d6..b01558661e3b 100644
--- a/trunk/fs/btrfs/zlib.c
+++ b/trunk/fs/btrfs/zlib.c
@@ -225,6 +225,10 @@ int btrfs_zlib_compress_pages(struct address_space *mapping,
 	data_in = kmap(in_page);
 
 	out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+	if (out_page == NULL) {
+		ret = -1;
+		goto out;
+	}
 	cpage_out = kmap(out_page);
 	pages[0] = out_page;
 	nr_pages = 1;
@@ -263,6 +267,10 @@ int btrfs_zlib_compress_pages(struct address_space *mapping,
 				goto out;
 			}
 			out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+			if (out_page == NULL) {
+				ret = -1;
+				goto out;
+			}
 			cpage_out = kmap(out_page);
 			pages[nr_pages] = out_page;
 			nr_pages++;