aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-09-21 20:02:55 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 10:17:35 -0400
commitbbba809e96539672f775a3d70102657d05816a5b (patch)
tree6cd9f7b028316f50fa3a06d78cb11ee982c3d09b /drivers/md
parent72ff13b7036bc7923e0f2b5f4a724ca260d49aab (diff)
md: avoid use of broken kzalloc mempool
The kzalloc mempool does not re-zero items that have been used and then returned to the pool. Manually zero the allocated multipath_bh instead. Acked-by: Neil Brown <neilb@suse.de> Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md')
-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