git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfq-iosched: apply bool value where we return 0/1
[safe/jmp/linux-2.6]
/
block
/
blk-softirq.c
diff --git
a/block/blk-softirq.c
b/block/blk-softirq.c
index
7ab344a
..
ee9c216
100644
(file)
--- a/
block/blk-softirq.c
+++ b/
block/blk-softirq.c
@@
-64,7
+64,7
@@
static int raise_blk_irq(int cpu, struct request *rq)
data->info = rq;
data->flags = 0;
data->info = rq;
data->flags = 0;
- __smp_call_function_single(cpu, data);
+ __smp_call_function_single(cpu, data
, 0
);
return 0;
}
return 0;
}
@@
-154,12
+154,14
@@
do_local:
**/
void blk_complete_request(struct request *req)
{
**/
void blk_complete_request(struct request *req)
{
+ if (unlikely(blk_should_fake_timeout(req->q)))
+ return;
if (!blk_mark_rq_complete(req))
__blk_complete_request(req);
}
EXPORT_SYMBOL(blk_complete_request);
if (!blk_mark_rq_complete(req))
__blk_complete_request(req);
}
EXPORT_SYMBOL(blk_complete_request);
-__init int blk_softirq_init(void)
+
static
__init int blk_softirq_init(void)
{
int i;
{
int i;