diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 11:19:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 11:19:16 -0500 |
commit | 6035ccd8e9e40bb654fbfdef325902ab531679a5 (patch) | |
tree | c1810d8a4d4ef150cdf14af72e6087dfc3f4b6e0 /block/blk-core.c | |
parent | 23eb3b64b5e44680c867e165fe1cd18e57fba255 (diff) | |
parent | 878eaddd05d251cefa9632c2b8046833c5eead66 (diff) |
Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block: (113 commits)
cfq-iosched: Do not access cfqq after freeing it
block: include linux/err.h to use ERR_PTR
cfq-iosched: use call_rcu() instead of doing grace period stall on queue exit
blkio: Allow CFQ group IO scheduling even when CFQ is a module
blkio: Implement dynamic io controlling policy registration
blkio: Export some symbols from blkio as its user CFQ can be a module
block: Fix io_context leak after failure of clone with CLONE_IO
block: Fix io_context leak after clone with CLONE_IO
cfq-iosched: make nonrot check logic consistent
io controller: quick fix for blk-cgroup and modular CFQ
cfq-iosched: move IO controller declerations to a header file
cfq-iosched: fix compile problem with !CONFIG_CGROUP
blkio: Documentation
blkio: Wait on sync-noidle queue even if rq_noidle = 1
blkio: Implement group_isolation tunable
blkio: Determine async workload length based on total number of queues
blkio: Wait for cfq queue to get backlogged if group is empty
blkio: Propagate cgroup weight updation to cfq groups
blkio: Drop the reference to queue once the task changes cgroup
blkio: Provide some isolation between groups
...
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 71da5111120c..718897e6d37f 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -2358,6 +2358,25 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq, | |||
2358 | rq->rq_disk = bio->bi_bdev->bd_disk; | 2358 | rq->rq_disk = bio->bi_bdev->bd_disk; |
2359 | } | 2359 | } |
2360 | 2360 | ||
2361 | #if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE | ||
2362 | /** | ||
2363 | * rq_flush_dcache_pages - Helper function to flush all pages in a request | ||
2364 | * @rq: the request to be flushed | ||
2365 | * | ||
2366 | * Description: | ||
2367 | * Flush all pages in @rq. | ||
2368 | */ | ||
2369 | void rq_flush_dcache_pages(struct request *rq) | ||
2370 | { | ||
2371 | struct req_iterator iter; | ||
2372 | struct bio_vec *bvec; | ||
2373 | |||
2374 | rq_for_each_segment(bvec, rq, iter) | ||
2375 | flush_dcache_page(bvec->bv_page); | ||
2376 | } | ||
2377 | EXPORT_SYMBOL_GPL(rq_flush_dcache_pages); | ||
2378 | #endif | ||
2379 | |||
2361 | /** | 2380 | /** |
2362 | * blk_lld_busy - Check if underlying low-level drivers of a device are busy | 2381 | * blk_lld_busy - Check if underlying low-level drivers of a device are busy |
2363 | * @q : the queue of the device being checked | 2382 | * @q : the queue of the device being checked |