diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 08:17:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 08:17:04 -0700 |
| commit | 402a26f0c040077ed6f941eefac5a6971f0d5f40 (patch) | |
| tree | f74e5d732404e9716b3c753007bac0f5d1e92869 /block | |
| parent | bf7cf6ee1bd00679bbe93b6ae73f80032759b8df (diff) | |
| parent | 4f73247f0e53be1bd4aa519476e6261a8e4a64ab (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] block/elevator.c: remove unused exports
[PATCH] splice: fix smaller sized splice reads
[PATCH] Don't inherit ->splice_pipe across forks
[patch] cleanup: use blk_queue_stopped
[PATCH] Document online io scheduler switching
Diffstat (limited to 'block')
| -rw-r--r-- | block/elevator.c | 2 | ||||
| -rw-r--r-- | block/ll_rw_blk.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/block/elevator.c b/block/elevator.c index 0d6be03d929..29825792cbd 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -895,10 +895,8 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name) EXPORT_SYMBOL(elv_dispatch_sort); EXPORT_SYMBOL(elv_add_request); EXPORT_SYMBOL(__elv_add_request); -EXPORT_SYMBOL(elv_requeue_request); EXPORT_SYMBOL(elv_next_request); EXPORT_SYMBOL(elv_dequeue_request); EXPORT_SYMBOL(elv_queue_empty); -EXPORT_SYMBOL(elv_completed_request); EXPORT_SYMBOL(elevator_exit); EXPORT_SYMBOL(elevator_init); diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index e112d1a5dab..1755c053fd6 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -1554,7 +1554,7 @@ void blk_plug_device(request_queue_t *q) * don't plug a stopped queue, it must be paired with blk_start_queue() * which will restart the queueing */ - if (test_bit(QUEUE_FLAG_STOPPED, &q->queue_flags)) + if (blk_queue_stopped(q)) return; if (!test_and_set_bit(QUEUE_FLAG_PLUGGED, &q->queue_flags)) { @@ -1587,7 +1587,7 @@ EXPORT_SYMBOL(blk_remove_plug); */ void __generic_unplug_device(request_queue_t *q) { - if (unlikely(test_bit(QUEUE_FLAG_STOPPED, &q->queue_flags))) + if (unlikely(blk_queue_stopped(q))) return; if (!blk_remove_plug(q)) |