diff options
author | Tao Ma <boyu.mt@taobao.com> | 2011-09-14 09:31:01 +0200 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-09-14 09:31:01 +0200 |
commit | 8ad6a56f5679a987bfeacad1bd818a2a381aa98e (patch) | |
tree | 945959995bd601627b300db0971deb4648770718 /block | |
parent | 09f40f98bfa2ac22a332a713629a2f8f92896834 (diff) | |
download | linux-stable-8ad6a56f5679a987bfeacad1bd818a2a381aa98e.tar.gz linux-stable-8ad6a56f5679a987bfeacad1bd818a2a381aa98e.tar.bz2 linux-stable-8ad6a56f5679a987bfeacad1bd818a2a381aa98e.zip |
block: Don't check QUEUE_FLAG_SAME_COMP in __blk_complete_request
In __blk_complete_request, we check both QUEUE_FLAG_SAME_COMP and req->cpu
to decide whether we should use req->cpu. Actually the user can also
select the complete cpu by either setting BIO_CPU_AFFINE or by calling
bio_set_completion_cpu. Current solution makes these 2 ways don't work
any more. So we'd better just check req->cpu.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c index 58340d0cb23a..1366a89d8e66 100644 --- a/block/blk-softirq.c +++ b/block/blk-softirq.c @@ -115,7 +115,7 @@ void __blk_complete_request(struct request *req) /* * Select completion CPU */ - if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) && req->cpu != -1) { + if (req->cpu != -1) { ccpu = req->cpu; if (!test_bit(QUEUE_FLAG_SAME_FORCE, &q->queue_flags)) { ccpu = blk_cpu_to_group(ccpu); |