diff options
Diffstat (limited to 'mm/swap_state.c')
| -rw-r--r-- | mm/swap_state.c | 11 | 
1 files changed, 5 insertions, 6 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 132164f7d0a..dfd9a46755b 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -83,7 +83,7 @@ static int __add_to_swap_cache(struct page *page, swp_entry_t entry,  			page_cache_get(page);  			SetPageLocked(page);  			SetPageSwapCache(page); -			page->private = entry.val; +			set_page_private(page, entry.val);  			total_swapcache_pages++;  			pagecache_acct(1);  		} @@ -126,8 +126,8 @@ void __delete_from_swap_cache(struct page *page)  	BUG_ON(PageWriteback(page));  	BUG_ON(PagePrivate(page)); -	radix_tree_delete(&swapper_space.page_tree, page->private); -	page->private = 0; +	radix_tree_delete(&swapper_space.page_tree, page_private(page)); +	set_page_private(page, 0);  	ClearPageSwapCache(page);  	total_swapcache_pages--;  	pagecache_acct(-1); @@ -197,7 +197,7 @@ void delete_from_swap_cache(struct page *page)  {  	swp_entry_t entry; -	entry.val = page->private; +	entry.val = page_private(page);  	write_lock_irq(&swapper_space.tree_lock);  	__delete_from_swap_cache(page); @@ -259,8 +259,7 @@ static inline void free_swap_cache(struct page *page)  /*    * Perform a free_page(), also freeing any swap cache associated with - * this page if it is the last user of the page. Can not do a lock_page, - * as we are holding the page_table_lock spinlock. + * this page if it is the last user of the page.   */  void free_page_and_swap_cache(struct page *page)  {  | 
