From ce7158ce6592c350d3bdc35b45e6ce31dd113048 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 2 Jun 2011 13:14:15 +0200 Subject: [PATCH] --- yaml --- r: 253029 b: refs/heads/master c: e3a57b3ccf5c04934ac43b5b80e32ba51b817288 h: refs/heads/master i: 253027: e6382acc629b5c654605eeb25555fcc78fa1050f v: v3 --- [refs] | 2 +- trunk/block/blk-ioc.c | 4 ++-- trunk/block/cfq-iosched.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0c9450ac18e3..c706ef5b6bcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b83c771214cf6a256ee875050e6eaf320cf7983 +refs/heads/master: e3a57b3ccf5c04934ac43b5b80e32ba51b817288 diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c index c898049dafd5..342eae9b0d3c 100644 --- a/trunk/block/blk-ioc.c +++ b/trunk/block/blk-ioc.c @@ -21,7 +21,7 @@ static void cfq_dtor(struct io_context *ioc) if (!hlist_empty(&ioc->cic_list)) { struct cfq_io_context *cic; - cic = list_entry(ioc->cic_list.first, struct cfq_io_context, + cic = hlist_entry(ioc->cic_list.first, struct cfq_io_context, cic_list); cic->dtor(ioc); } @@ -57,7 +57,7 @@ static void cfq_exit(struct io_context *ioc) if (!hlist_empty(&ioc->cic_list)) { struct cfq_io_context *cic; - cic = list_entry(ioc->cic_list.first, struct cfq_io_context, + cic = hlist_entry(ioc->cic_list.first, struct cfq_io_context, cic_list); cic->exit(ioc); } diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 8a02c955c610..3c7b537bf908 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -3786,9 +3786,6 @@ cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask) return 0; queue_fail: - if (cic) - put_io_context(cic->ioc); - cfq_schedule_dispatch(cfqd); spin_unlock_irqrestore(q->queue_lock, flags); cfq_log(cfqd, "set_request fail");