From 82b0f9c6529641dddfbd5217895897a3f22819f3 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 8 Mar 2006 13:31:44 +0100 Subject: [PATCH] --- yaml --- r: 24427 b: refs/heads/master c: f68110fc28859f5d7231d5c4fb6dbe68b1394c9b h: refs/heads/master i: 24425: 21d0630e3101397a8939c02664418da3baa26555 24423: 2dbba4d9a369cf489756c490d6d92e1fd3d5c467 v: v3 --- [refs] | 2 +- trunk/block/ll_rw_blk.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ce13ed44ad05..13bd88694398 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06ff37ffb4ba8bcbda0e9d19c712c954ef7b8a0a +refs/heads/master: f68110fc28859f5d7231d5c4fb6dbe68b1394c9b diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c index 062067fa7ead..b836b43113da 100644 --- a/trunk/block/ll_rw_blk.c +++ b/trunk/block/ll_rw_blk.c @@ -906,17 +906,15 @@ init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth) __FUNCTION__, depth); } - tag_index = kmalloc(depth * sizeof(struct request *), GFP_ATOMIC); + tag_index = kzalloc(depth * sizeof(struct request *), GFP_ATOMIC); if (!tag_index) goto fail; nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG; - tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC); + tag_map = kzalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC); if (!tag_map) goto fail; - memset(tag_index, 0, depth * sizeof(struct request *)); - memset(tag_map, 0, nr_ulongs * sizeof(unsigned long)); tags->real_max_depth = depth; tags->max_depth = depth; tags->tag_index = tag_index;