---

yaml --- r: 164443 b: refs/heads/master c: bbba809 h: refs/heads/master i: 164441: fb79dad 164439: def1ed3 v: v3
git-mirror · Sep 22, 2009 · b4413bc · b4413bc
1 parent 342d7a9
commit b4413bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72ff13b7036bc7923e0f2b5f4a724ca260d49aab
+refs/heads/master: bbba809e96539672f775a3d70102657d05816a5b
diff --git a/trunk/drivers/md/multipath.c b/trunk/drivers/md/multipath.c
@@ -150,6 +150,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)
 	}
 
 	mp_bh = mempool_alloc(conf->pool, GFP_NOIO);
+	memset(mp_bh, 0, sizeof(*mp_bh));
 
 	mp_bh->master_bio = bio;
 	mp_bh->mddev = mddev;
@@ -493,7 +494,7 @@ static int multipath_run (mddev_t *mddev)
 	}
 	mddev->degraded = conf->raid_disks - conf->working_disks;
 
-	conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS,
+	conf->pool = mempool_create_kmalloc_pool(NR_RESERVED_BUFS,
 						 sizeof(struct multipath_bh));
 	if (conf->pool == NULL) {
 		printk(KERN_ERR