diff options
-rw-r--r-- | include/linux/pagemap.h | 1 | ||||
-rw-r--r-- | mm/filemap.c | 25 |
2 files changed, 9 insertions, 17 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0aa258f4678d..ea36ff29a51a 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h | |||
@@ -456,7 +456,6 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, | |||
456 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, | 456 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, |
457 | pgoff_t index, gfp_t gfp_mask); | 457 | pgoff_t index, gfp_t gfp_mask); |
458 | extern void delete_from_page_cache(struct page *page); | 458 | extern void delete_from_page_cache(struct page *page); |
459 | extern void remove_from_page_cache(struct page *page); | ||
460 | extern void __remove_from_page_cache(struct page *page); | 459 | extern void __remove_from_page_cache(struct page *page); |
461 | int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask); | 460 | int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask); |
462 | 461 | ||
diff --git a/mm/filemap.c b/mm/filemap.c index e7b59785ceb9..1cfb8fd84b27 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -137,7 +137,15 @@ void __remove_from_page_cache(struct page *page) | |||
137 | } | 137 | } |
138 | } | 138 | } |
139 | 139 | ||
140 | void remove_from_page_cache(struct page *page) | 140 | /** |
141 | * delete_from_page_cache - delete page from page cache | ||
142 | * @page: the page which the kernel is trying to remove from page cache | ||
143 | * | ||
144 | * This must be called only on pages that have been verified to be in the page | ||
145 | * cache and locked. It will never put the page into the free list, the caller | ||
146 | * has a reference on the page. | ||
147 | */ | ||
148 | void delete_from_page_cache(struct page *page) | ||
141 | { | 149 | { |
142 | struct address_space *mapping = page->mapping; | 150 | struct address_space *mapping = page->mapping; |
143 | void (*freepage)(struct page *); | 151 | void (*freepage)(struct page *); |
@@ -152,21 +160,6 @@ void remove_from_page_cache(struct page *page) | |||
152 | 160 | ||
153 | if (freepage) | 161 | if (freepage) |
154 | freepage(page); | 162 | freepage(page); |
155 | } | ||
156 | EXPORT_SYMBOL(remove_from_page_cache); | ||
157 | |||
158 | /** | ||
159 | * delete_from_page_cache - delete page from page cache | ||
160 | * @page: the page which the kernel is trying to remove from page cache | ||
161 | * | ||
162 | * This must be called only on pages that have | ||
163 | * been verified to be in the page cache and locked. | ||
164 | * It will never put the page into the free list, | ||
165 | * the caller has a reference on the page. | ||
166 | */ | ||
167 | void delete_from_page_cache(struct page *page) | ||
168 | { | ||
169 | remove_from_page_cache(page); | ||
170 | page_cache_release(page); | 163 | page_cache_release(page); |
171 | } | 164 | } |
172 | EXPORT_SYMBOL(delete_from_page_cache); | 165 | EXPORT_SYMBOL(delete_from_page_cache); |