From 993de117b014fe7991b36ce61ac5c3376a0d250c Mon Sep 17 00:00:00 2001
From: Jianpeng Ma <majianpeng@gmail.com>
Date: Thu, 11 Oct 2012 13:45:36 +1100
Subject: [PATCH] --- yaml --- r: 334248 b: refs/heads/master c:
 582e2e056a5c3410174c23f5134e6b00e0db9101 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/bitmap.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b6d25ffdc716..a4d7a60d3428 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ad4d4a68a1a19f21c7b39cb3f51bf17fba6e3d0
+refs/heads/master: 582e2e056a5c3410174c23f5134e6b00e0db9101
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index df73375c160a..7155945f8eb8 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -470,14 +470,10 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
 {
 	bitmap_super_t *sb;
 	unsigned long chunksize, daemon_sleep, write_behind;
-	int err = -EINVAL;
 
 	bitmap->storage.sb_page = alloc_page(GFP_KERNEL);
-	if (IS_ERR(bitmap->storage.sb_page)) {
-		err = PTR_ERR(bitmap->storage.sb_page);
-		bitmap->storage.sb_page = NULL;
-		return err;
-	}
+	if (bitmap->storage.sb_page == NULL)
+		return -ENOMEM;
 	bitmap->storage.sb_page->index = 0;
 
 	sb = kmap_atomic(bitmap->storage.sb_page);