1 files changed, 1 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index ee79b5d3439f..c085af2332d8 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -123,8 +123,7 @@ void remove_from_page_cache(struct page *page)
 {
        struct address_space *mapping = page->mapping;
-        if (unlikely(!PageLocked(page)))
+        BUG_ON(!PageLocked(page));
-                PAGE_BUG(page);
        write_lock_irq(&mapping->tree_lock);
        __remove_from_page_cache(page);

diff --git a/mm/filemap.c b/mm/filemap.c index ee79b5d3439f..c085af2332d8 100644 --- a/mm/filemap.c +++ b/mm/filemap.c
@@ -123,8 +123,7 @@ void remove_from_page_cache(struct page *page)
123	{	123	{
124	struct address_space *mapping = page->mapping;	124	struct address_space *mapping = page->mapping;
125		125
126	if (unlikely(!PageLocked(page)))	126	BUG_ON(!PageLocked(page));
127	PAGE_BUG(page);
128		127
129	write_lock_irq(&mapping->tree_lock);	128	write_lock_irq(&mapping->tree_lock);
130	__remove_from_page_cache(page);	129	__remove_from_page_cache(page);