diff options
| author | Jens Axboe <axboe@suse.de> | 2006-06-14 19:11:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-14 10:22:16 -0700 |
| commit | 553698f944ed715dfe023b4cef07601f0ce735f0 (patch) | |
| tree | 2c9019e43218a3afc92fbb32a44de794123295f4 /block/cfq-iosched.c | |
| parent | 9cedc194a7735e5d74ad26d3825247dc65a4d98e (diff) | |
| download | lwn-553698f944ed715dfe023b4cef07601f0ce735f0.tar.gz lwn-553698f944ed715dfe023b4cef07601f0ce735f0.zip | |
[PATCH] cfq-iosched: fix crash in do_div()
We don't clear the seek stat values in cfq_alloc_io_context(), and if
->seek_mean is unlucky enough to be set to -36 by chance, the first
invocation of cfq_update_io_seektime() will oops with a divide by zero
in do_div().
Just memset the entire cic instead of filling invididual values
independently.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index a46d030e092a..052b17487625 100644 --- a/block/cfq-iosched.c +++ b/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); } |