git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
firewire: core: integrate software-forced bus resets with bus management
[pandora-kernel.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index
718897e
..
d1a9a0a
100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-1147,7
+1147,7
@@
void init_request_from_bio(struct request *req, struct bio *bio)
*/
static inline bool queue_should_plug(struct request_queue *q)
{
*/
static inline bool queue_should_plug(struct request_queue *q)
{
- return !(blk_queue_nonrot(q) && blk_queue_
queuing
(q));
+ return !(blk_queue_nonrot(q) && blk_queue_
tagged
(q));
}
static int __make_request(struct request_queue *q, struct bio *bio)
}
static int __make_request(struct request_queue *q, struct bio *bio)
@@
-1859,15
+1859,8
@@
void blk_dequeue_request(struct request *rq)
* and to it is freed is accounted as io that is in progress at
* the driver side.
*/
* and to it is freed is accounted as io that is in progress at
* the driver side.
*/
- if (blk_account_rq(rq))
{
+ if (blk_account_rq(rq))
q->in_flight[rq_is_sync(rq)]++;
q->in_flight[rq_is_sync(rq)]++;
- /*
- * Mark this device as supporting hardware queuing, if
- * we have more IOs in flight than 4.
- */
- if (!blk_queue_queuing(q) && queue_in_flight(q) > 4)
- set_bit(QUEUE_FLAG_CQ, &q->queue_flags);
- }
}
/**
}
/**