diff options
| author | faux123 <reioux@gmail.com> | 2012-02-17 01:40:52 -0800 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-01-08 10:42:56 +0100 |
| commit | 57645c3efe96f3cb1e380bfd483386304df60613 (patch) | |
| tree | be259d49b68254a9a9fae6bd3f6a611632ca0aea /block | |
| parent | f4e74a133113a5c37797dcb6bb0b926ab8773d97 (diff) | |
| download | kernel_samsung_tuna-57645c3efe96f3cb1e380bfd483386304df60613.zip kernel_samsung_tuna-57645c3efe96f3cb1e380bfd483386304df60613.tar.gz kernel_samsung_tuna-57645c3efe96f3cb1e380bfd483386304df60613.tar.bz2 | |
block/cfq-iosched: fix merge error
Diffstat (limited to 'block')
| -rw-r--r-- | block/cfq-iosched.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 1947b13..072737a 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3463,9 +3463,7 @@ static void cfq_put_request(struct request *rq) BUG_ON(!cfqq->allocated[rw]); cfqq->allocated[rw]--; - put_io_context(RQ_CIC(rq)->icq.ioc, cfqq->cfqd->queue); - - put_io_context(RQ_CIC(rq)->icq.ioc, cfqq->cfqd->queue); + put_io_context(RQ_CIC(rq)->icq.ioc); /* Put down rq reference on cfqg */ cfq_put_cfqg(RQ_CFQG(rq)); |