diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /fs/buffer.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 26580ee0d..4e9fa9015 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -28,6 +28,7 @@ /* async buffer flushing, 1999 Andrea Arcangeli <andrea@suse.de> */ +#include <linux/config.h> #include <linux/sched.h> #include <linux/fs.h> #include <linux/malloc.h> @@ -1755,8 +1756,6 @@ static void end_buffer_io_kiobuf(struct buffer_head *bh, int uptodate) kiobuf = bh->b_kiobuf; unlock_buffer(bh); - - kiobuf = bh->b_kiobuf; end_kio_request(kiobuf, uptodate); } @@ -2192,7 +2191,7 @@ busy_buffer_page: void show_buffers(void) { -#ifdef __SMP__ +#ifdef CONFIG_SMP struct buffer_head * bh; int found = 0, locked = 0, dirty = 0, used = 0, lastused = 0; int protected = 0; @@ -2203,7 +2202,7 @@ void show_buffers(void) printk("Buffer memory: %6dkB\n", atomic_read(&buffermem_pages) << (PAGE_SHIFT-10)); -#ifdef __SMP__ /* trylock does nothing on UP and so we could deadlock */ +#ifdef CONFIG_SMP /* trylock does nothing on UP and so we could deadlock */ if (!spin_trylock(&lru_list_lock)) return; for(nlist = 0; nlist < NR_LIST; nlist++) { @@ -2416,6 +2415,12 @@ static int sync_old_buffers(void) return 0; } +int block_sync_page(struct page *page) +{ + run_task_queue(&tq_disk); + return 0; +} + /* This is the interface to bdflush. As we get more sophisticated, we can * pass tuning parameters to this "process", to adjust how it behaves. * We would want to verify each parameter, however, to make sure that it |