summaryrefslogtreecommitdiff
path: root/fs/buffer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-05-28 05:39:56 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-05-28 05:39:56 -0700
commit9c2c68b81deab6d2e25cb0dd3c56fa8d3ea00be0 (patch)
tree730e7212a4bb3de802f590b8f8b0ace62af1c382 /fs/buffer.c
parentb8391722e97b71d037f9bbdc81c4ee3685229d20 (diff)
parenteba5b46c3c8002cf528a0472b70356d77438ca98 (diff)
Merge home.transmeta.com:/home/torvalds/v2.5/blk-plug
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs/buffer.c')
-rw-r--r--fs/buffer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index a1ad704c84e2..e4166036523e 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -138,7 +138,7 @@ void __wait_on_buffer(struct buffer_head * bh)
get_bh(bh);
add_wait_queue(wq, &wait);
do {
- run_task_queue(&tq_disk);
+ blk_run_queues();
set_task_state(tsk, TASK_UNINTERRUPTIBLE);
if (!buffer_locked(bh))
break;
@@ -488,7 +488,7 @@ static void free_more_memory(void)
wakeup_bdflush();
try_to_free_pages(zone, GFP_NOFS, 0);
- run_task_queue(&tq_disk);
+ blk_run_queues();
__set_current_state(TASK_RUNNING);
yield();
}
@@ -1014,7 +1014,7 @@ no_grow:
* the reserve list is empty, we're sure there are
* async buffer heads in use.
*/
- run_task_queue(&tq_disk);
+ blk_run_queues();
free_more_memory();
goto try_again;
@@ -2475,7 +2475,7 @@ EXPORT_SYMBOL(try_to_free_buffers);
int block_sync_page(struct page *page)
{
- run_task_queue(&tq_disk);
+ blk_run_queues();
return 0;
}