From: Andrew Morton If remove_mapping() failed to remove the page from its mapping, don't go and mark it not uptodate! Makes kernel go dead. (Actually, I don't think the ClearPageUptodate is needed there at all). Cc: Nick Piggin Signed-off-by: Andrew Morton --- mm/truncate.c | 3 ++- mm/vmscan.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff -puN mm/truncate.c~remove_mapping-fix mm/truncate.c --- a/mm/truncate.c~remove_mapping-fix +++ a/mm/truncate.c @@ -96,7 +96,8 @@ invalidate_complete_page(struct address_ return 0; ret = remove_mapping(mapping, page); - ClearPageUptodate(page); + if (likely(ret)) + ClearPageUptodate(page); return ret; } diff -puN mm/vmscan.c~remove_mapping-fix mm/vmscan.c --- a/mm/vmscan.c~remove_mapping-fix +++ a/mm/vmscan.c @@ -378,6 +378,12 @@ static pageout_t pageout(struct page *pa return PAGE_CLEAN; } +/* + * Attempt to detach a locked page from its ->mapping. If it is dirty or if + * someone else has a ref on the page, abort and return 0. If it was + * successfully detached, return 1. Assumes the caller has a single ref on + * this page. + */ int remove_mapping(struct address_space *mapping, struct page *page) { BUG_ON(!PageLocked(page)); _