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
wl1271: use ieee80211_rx_ni()
[safe/jmp/linux-2.6]
/
block
/
cfq-iosched.c
diff --git
a/block/cfq-iosched.c
b/block/cfq-iosched.c
index
3010e2e
..
9c4b679
100644
(file)
--- a/
block/cfq-iosched.c
+++ b/
block/cfq-iosched.c
@@
-1345,15
+1345,9
@@
static int cfq_dispatch_requests(struct request_queue *q, int force)
unsigned long last_sync = jiffies - cfqd->last_end_sync_rq;
unsigned int depth;
unsigned long last_sync = jiffies - cfqd->last_end_sync_rq;
unsigned int depth;
- /*
- * must wait a bit longer
- */
- if (last_sync < cfq_slice_sync) {
- cfq_schedule_dispatch(cfqd, cfq_slice_sync - last_sync);
- return 0;
- }
-
- depth = last_sync / cfq_slice_sync;
+ depth = last_sync / cfqd->cfq_slice[1];
+ if (!depth && !cfqq->dispatched)
+ depth = 1;
if (depth < max_dispatch)
max_dispatch = depth;
}
if (depth < max_dispatch)
max_dispatch = depth;
}