X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Ftruncate.c;h=00fb58a271a86806d34c52fd56f726a83246cccf;hb=fcb8996728fb59eddf84678df7cb213b2c9a2e26;hp=b40ac6d4e86e7ea7d1df670e709452948a1dcb74;hpb=0b001b2edaead6fd906b1f87967ae05f082189c4;p=pandora-kernel.git diff --git a/mm/truncate.c b/mm/truncate.c index b40ac6d4e86e..00fb58a271a8 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -394,11 +394,12 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page) if (page_has_private(page) && !try_to_release_page(page, GFP_KERNEL)) return 0; + clear_page_mlock(page); + spin_lock_irq(&mapping->tree_lock); if (PageDirty(page)) goto failed; - clear_page_mlock(page); BUG_ON(page_has_private(page)); __delete_from_page_cache(page); spin_unlock_irq(&mapping->tree_lock);