aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/md/multipath.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 89e76819f61f..d2d3fd54cc68 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -150,6 +150,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)
150 } 150 }
151 151
152 mp_bh = mempool_alloc(conf->pool, GFP_NOIO); 152 mp_bh = mempool_alloc(conf->pool, GFP_NOIO);
153 memset(mp_bh, 0, sizeof(*mp_bh));
153 154
154 mp_bh->master_bio = bio; 155 mp_bh->master_bio = bio;
155 mp_bh->mddev = mddev; 156 mp_bh->mddev = mddev;
@@ -493,7 +494,7 @@ static int multipath_run (mddev_t *mddev)
493 } 494 }
494 mddev->degraded = conf->raid_disks - conf->working_disks; 495 mddev->degraded = conf->raid_disks - conf->working_disks;
495 496
496 conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS, 497 conf->pool = mempool_create_kmalloc_pool(NR_RESERVED_BUFS,
497 sizeof(struct multipath_bh)); 498 sizeof(struct multipath_bh));
498 if (conf->pool == NULL) { 499 if (conf->pool == NULL) {
499 printk(KERN_ERR 500 printk(KERN_ERR