---

yaml --- r: 334248 b: refs/heads/master c: 582e2e0 h: refs/heads/master v: v3
git-mirror · Oct 11, 2012 · 993de11 · 993de11
1 parent 117333c
commit 993de11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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);