diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 1 | ||||
| -rw-r--r-- | include/linux/pagemap.h | 1 | ||||
| -rw-r--r-- | include/linux/swap.h | 12 |
3 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 792df9495..8afa183f9 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -738,7 +738,6 @@ extern int fs_may_mount(kdev_t); extern struct file *inuse_filps; -extern void set_writetime(struct buffer_head *, int); extern int try_to_free_buffers(struct page *); extern void refile_buffer(struct buffer_head * buf); diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index c5a8af7c7..3b7272caa 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -76,6 +76,7 @@ extern void lock_page(struct page *page); extern void __add_page_to_hash_queue(struct page * page, struct page **p); +extern void add_to_page_cache(struct page * page, struct inode * inode, unsigned long offset); extern int add_to_page_cache_unique(struct page * page, struct inode * inode, unsigned long offset, struct page **hash); static inline void add_page_to_hash_queue(struct page * page, struct inode * inode, unsigned long offset) diff --git a/include/linux/swap.h b/include/linux/swap.h index c06ddba63..e95a3881a 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -52,7 +52,6 @@ struct swap_info_struct { kdev_t swap_device; struct dentry * swap_file; unsigned short * swap_map; - unsigned char * swap_lockmap; unsigned int lowest_bit; unsigned int highest_bit; unsigned int cluster_next; @@ -85,7 +84,7 @@ extern void swap_setup (void); extern int try_to_free_pages(unsigned int gfp_mask); /* linux/mm/page_io.c */ -extern void rw_swap_page(int, unsigned long, char *, int); +extern void rw_swap_page(int, struct page *, int); extern void rw_swap_page_nocache(int, unsigned long, char *); extern void rw_swap_page_nolock(int, unsigned long, char *, int); extern void swap_after_unlock_page (unsigned long entry); @@ -97,7 +96,7 @@ extern void swap_in(struct task_struct *, struct vm_area_struct *, /* linux/mm/swap_state.c */ extern void show_swap_cache_info(void); -extern int add_to_swap_cache(struct page *, unsigned long); +extern void add_to_swap_cache(struct page *, unsigned long); extern int swap_duplicate(unsigned long); extern int swap_check_entry(unsigned long); struct page * lookup_swap_cache(unsigned long); @@ -146,13 +145,6 @@ extern unsigned long swap_cache_find_total; extern unsigned long swap_cache_find_success; #endif -extern inline unsigned long in_swap_cache(struct page *page) -{ - if (PageSwapCache(page)) - return page->offset; - return 0; -} - /* * Work out if there are any other processes sharing this page, ignoring * any page reference coming from the swap cache, or from outstanding |