diff options
Diffstat (limited to 'mm/truncate.c')
-rw-r--r-- | mm/truncate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/truncate.c b/mm/truncate.c index f4edbc179d14..e07b1e682c38 100644 --- a/mm/truncate.c +++ b/mm/truncate.c | |||
@@ -96,7 +96,6 @@ invalidate_complete_page(struct address_space *mapping, struct page *page) | |||
96 | return 0; | 96 | return 0; |
97 | 97 | ||
98 | ret = remove_mapping(mapping, page); | 98 | ret = remove_mapping(mapping, page); |
99 | ClearPageUptodate(page); | ||
100 | 99 | ||
101 | return ret; | 100 | return ret; |
102 | } | 101 | } |
@@ -302,7 +301,7 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page) | |||
302 | if (page->mapping != mapping) | 301 | if (page->mapping != mapping) |
303 | return 0; | 302 | return 0; |
304 | 303 | ||
305 | if (PagePrivate(page) && !try_to_release_page(page, 0)) | 304 | if (PagePrivate(page) && !try_to_release_page(page, GFP_KERNEL)) |
306 | return 0; | 305 | return 0; |
307 | 306 | ||
308 | write_lock_irq(&mapping->tree_lock); | 307 | write_lock_irq(&mapping->tree_lock); |
@@ -396,6 +395,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping, | |||
396 | pagevec_release(&pvec); | 395 | pagevec_release(&pvec); |
397 | cond_resched(); | 396 | cond_resched(); |
398 | } | 397 | } |
398 | WARN_ON_ONCE(ret); | ||
399 | return ret; | 399 | return ret; |
400 | } | 400 | } |
401 | EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range); | 401 | EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range); |