diff options
| -rw-r--r-- | fs/buffer.c | 3 | ||||
| -rw-r--r-- | include/linux/mm.h | 20 | ||||
| -rw-r--r-- | mm/page-writeback.c | 38 | ||||
| -rw-r--r-- | mm/swap_state.c | 2 |
4 files changed, 46 insertions, 17 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 20ce7d8af030..248b3ea97c1e 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -951,7 +951,8 @@ int __set_page_dirty_buffers(struct page *page) if (page->mapping) { /* Race with truncate? */ if (!mapping->backing_dev_info->memory_backed) inc_page_state(nr_dirty); - radix_tree_tag_set(&mapping->page_tree, page->index, + radix_tree_tag_set(&mapping->page_tree, + page_index(page), PAGECACHE_TAG_DIRTY); } spin_unlock_irq(&mapping->tree_lock); diff --git a/include/linux/mm.h b/include/linux/mm.h index 78e2f8581d41..56ccfb5ec82a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -415,9 +415,27 @@ void page_address_init(void); * address_space which maps the page from disk; whereas "page_mapped" * refers to user virtual address space into which the page is mapped. */ +extern struct address_space swapper_space; static inline struct address_space *page_mapping(struct page *page) { - return PageAnon(page)? NULL: page->mapping; + struct address_space *mapping = NULL; + + if (unlikely(PageSwapCache(page))) + mapping = &swapper_space; + else if (likely(!PageAnon(page))) + mapping = page->mapping; + return mapping; +} + +/* + * Return the pagecache index of the passed page. Regular pagecache pages + * use ->index whereas swapcache pages use ->private + */ +static inline pgoff_t page_index(struct page *page) +{ + if (unlikely(PageSwapCache(page))) + return page->private; + return page->index; } /* diff --git a/mm/page-writeback.c b/mm/page-writeback.c index bad516d9b9ff..1a5ecf964547 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -560,16 +560,17 @@ int __set_page_dirty_nobuffers(struct page *page) int ret = 0; if (!TestSetPageDirty(page)) { - struct address_space *mapping = page->mapping; + struct address_space *mapping = page_mapping(page); if (mapping) { spin_lock_irq(&mapping->tree_lock); - if (page->mapping) { /* Race with truncate? */ - BUG_ON(page->mapping != mapping); + mapping = page_mapping(page); + if (mapping) { /* Race with truncate? */ + BUG_ON(page_mapping(page) != mapping); if (!mapping->backing_dev_info->memory_backed) inc_page_state(nr_dirty); radix_tree_tag_set(&mapping->page_tree, - page->index, PAGECACHE_TAG_DIRTY); + page_index(page), PAGECACHE_TAG_DIRTY); } spin_unlock_irq(&mapping->tree_lock); if (!PageSwapCache(page)) @@ -600,14 +601,16 @@ EXPORT_SYMBOL(redirty_page_for_writepage); int fastcall set_page_dirty(struct page *page) { struct address_space *mapping = page_mapping(page); - int (*spd)(struct page *); - if (!mapping) { - SetPageDirty(page); - return 0; + if (likely(mapping)) { + int (*spd)(struct page *) = mapping->a_ops->set_page_dirty; + if (spd) + return (*spd)(page); + return __set_page_dirty_buffers(page); } - spd = mapping->a_ops->set_page_dirty; - return spd? (*spd)(page): __set_page_dirty_buffers(page); + if (!PageDirty(page)) + SetPageDirty(page); + return 0; } EXPORT_SYMBOL(set_page_dirty); @@ -644,7 +647,8 @@ int test_clear_page_dirty(struct page *page) if (mapping) { spin_lock_irqsave(&mapping->tree_lock, flags); if (TestClearPageDirty(page)) { - radix_tree_tag_clear(&mapping->page_tree, page->index, + radix_tree_tag_clear(&mapping->page_tree, + page_index(page), PAGECACHE_TAG_DIRTY); spin_unlock_irqrestore(&mapping->tree_lock, flags); if (!mapping->backing_dev_info->memory_backed) @@ -700,7 +704,8 @@ int __clear_page_dirty(struct page *page) spin_lock_irqsave(&mapping->tree_lock, flags); if (TestClearPageDirty(page)) { - radix_tree_tag_clear(&mapping->page_tree, page->index, + radix_tree_tag_clear(&mapping->page_tree, + page_index(page), PAGECACHE_TAG_DIRTY); spin_unlock_irqrestore(&mapping->tree_lock, flags); return 1; @@ -722,7 +727,8 @@ int test_clear_page_writeback(struct page *page) spin_lock_irqsave(&mapping->tree_lock, flags); ret = TestClearPageWriteback(page); if (ret) - radix_tree_tag_clear(&mapping->page_tree, page->index, + radix_tree_tag_clear(&mapping->page_tree, + page_index(page), PAGECACHE_TAG_WRITEBACK); spin_unlock_irqrestore(&mapping->tree_lock, flags); } else { @@ -742,10 +748,12 @@ int test_set_page_writeback(struct page *page) spin_lock_irqsave(&mapping->tree_lock, flags); ret = TestSetPageWriteback(page); if (!ret) - radix_tree_tag_set(&mapping->page_tree, page->index, + radix_tree_tag_set(&mapping->page_tree, + page_index(page), PAGECACHE_TAG_WRITEBACK); if (!PageDirty(page)) - radix_tree_tag_clear(&mapping->page_tree, page->index, + radix_tree_tag_clear(&mapping->page_tree, + page_index(page), PAGECACHE_TAG_DIRTY); spin_unlock_irqrestore(&mapping->tree_lock, flags); } else { diff --git a/mm/swap_state.c b/mm/swap_state.c index cc7a51f69870..cc11edc2aca1 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -12,6 +12,7 @@ #include <linux/swap.h> #include <linux/init.h> #include <linux/pagemap.h> +#include <linux/buffer_head.h> #include <linux/backing-dev.h> #include <asm/pgtable.h> @@ -22,6 +23,7 @@ */ static struct address_space_operations swap_aops = { .writepage = swap_writepage, + .set_page_dirty = __set_page_dirty_nobuffers, }; static struct backing_dev_info swap_backing_dev_info = { |