diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /mm/page_io.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'mm/page_io.c')
| -rw-r--r-- | mm/page_io.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index 75b7195fb..0f7e6d199 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -99,7 +99,7 @@ static void rw_swap_page_base(int rw, unsigned long entry, struct page *page, in } else if (p->swap_file) { struct inode *swapf = p->swap_file->d_inode; int i; - if (swapf->i_op->bmap == NULL + if (swapf->i_op->get_block == NULL && swapf->i_op->smap != NULL){ /* With MS-DOS, we use msdos_smap which returns @@ -110,7 +110,7 @@ static void rw_swap_page_base(int rw, unsigned long entry, struct page *page, in It sounds like ll_rw_swap_file defined its operation size (sector size) based on PAGE_SIZE and the number of blocks to read. - So using bmap or smap should work even if + So using get_block or smap should work even if smap will require more blocks. */ int j; @@ -147,8 +147,7 @@ static void rw_swap_page_base(int rw, unsigned long entry, struct page *page, in atomic_inc(&nr_async_pages); } if (dolock) { - /* only lock/unlock swap cache pages! */ - set_bit(PG_swap_unlock_after, &page->flags); + set_bit(PG_free_swap_after, &page->flags); p->swap_map[offset]++; } set_bit(PG_free_after, &page->flags); @@ -177,15 +176,6 @@ static void rw_swap_page_base(int rw, unsigned long entry, struct page *page, in } /* - * This is run when asynchronous page I/O has completed. - * It decrements the swap bitmap counter - */ -void swap_after_unlock_page(unsigned long entry) -{ - swap_free(entry); -} - -/* * A simple wrapper so the base function doesn't need to enforce * that all swap pages go through the swap cache! We verify that: * - the page is locked |