From b4413bc345c505d235d455f67c0f9c829856860d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 21 Sep 2009 17:02:55 -0700
Subject: [PATCH] --- yaml --- r: 164443 b: refs/heads/master c:
 bbba809e96539672f775a3d70102657d05816a5b h: refs/heads/master i:   164441:
 fb79dad42af74fd2539c469359a2b1c662cf0508   164439:
 def1ed390a65b2826407a90d692f168309818b01 v: v3

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

diff --git a/[refs] b/[refs]
index f9705350ca82..1ee528dea9a4 100644
--- 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
index 89e76819f61f..d2d3fd54cc68 100644
--- 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