[PATCH] invalidate: remove_mapping() fix
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). Says Nick Piggin: "Right, it isn't needed because at this point the page is guaranteed by remove_mapping to have no references (except us) and cannot pick up any new ones because it is removed from pagecache. We can delete it." Signed-off-by: Andrew Morton <akpm@osdl.org> Acked-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
5eb30790d4
commit
a649fd9271
|
@ -96,7 +96,6 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ret = remove_mapping(mapping, page);
|
ret = remove_mapping(mapping, page);
|
||||||
ClearPageUptodate(page);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -378,6 +378,12 @@ static pageout_t pageout(struct page *page, struct address_space *mapping)
|
||||||
return PAGE_CLEAN;
|
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)
|
int remove_mapping(struct address_space *mapping, struct page *page)
|
||||||
{
|
{
|
||||||
BUG_ON(!PageLocked(page));
|
BUG_ON(!PageLocked(page));
|
||||||
|
|
Loading…
Reference in New Issue