From 776c3787fd398f7c43c3c2827406f77d3f72c221 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 14 Jun 2006 19:11:57 +0200 Subject: [PATCH] --- yaml --- r: 27213 b: refs/heads/master c: 553698f944ed715dfe023b4cef07601f0ce735f0 h: refs/heads/master i: 27211: a6e2813c61e4e556922ee4bfb6e482d2c425e9d9 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ee6a20081db5..abd6f17e6713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cedc194a7735e5d74ad26d3825247dc65a4d98e +refs/heads/master: 553698f944ed715dfe023b4cef07601f0ce735f0 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index a46d030e092a..052b17487625 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1323,17 +1323,12 @@ cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask) struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask); if (cic) { - RB_CLEAR(&cic->rb_node); - cic->key = NULL; - cic->cfqq[ASYNC] = NULL; - cic->cfqq[SYNC] = NULL; + memset(cic, 0, sizeof(*cic)); + RB_CLEAR_COLOR(&cic->rb_node); cic->last_end_request = jiffies; - cic->ttime_total = 0; - cic->ttime_samples = 0; - cic->ttime_mean = 0; + INIT_LIST_HEAD(&cic->queue_list); cic->dtor = cfq_free_io_context; cic->exit = cfq_exit_io_context; - INIT_LIST_HEAD(&cic->queue_list); atomic_inc(&ioc_count); }