diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/truncate.c | 1 | ||||
-rw-r--r-- | mm/vmscan.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mm/truncate.c b/mm/truncate.c index 11ca480701dd..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 | } |
diff --git a/mm/vmscan.c b/mm/vmscan.c index eca70310adb2..af73c14f9d88 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -378,6 +378,12 @@ static pageout_t pageout(struct page *page, struct address_space *mapping) | |||
378 | return PAGE_CLEAN; | 378 | return PAGE_CLEAN; |
379 | } | 379 | } |
380 | 380 | ||
381 | /* | ||
382 | * Attempt to detach a locked page from its ->mapping. If it is dirty or if | ||
383 | * someone else has a ref on the page, abort and return 0. If it was | ||
384 | * successfully detached, return 1. Assumes the caller has a single ref on | ||
385 | * this page. | ||
386 | */ | ||
381 | int remove_mapping(struct address_space *mapping, struct page *page) | 387 | int remove_mapping(struct address_space *mapping, struct page *page) |
382 | { | 388 | { |
383 | BUG_ON(!PageLocked(page)); | 389 | BUG_ON(!PageLocked(page)); |