diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 21:07:58 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 21:07:58 +0200 |
| commit | 70268992c575948147c0e9c71d1e1ee0517a16ed (patch) | |
| tree | 6afda549de3bd5f3f5a93dff9be900c89bba0d07 /mm | |
| parent | 8a229ae2d652b42437863787cfc28f7f8a78a35d (diff) | |
| parent | 85ce02207e7728d82cc6183d34c2bdd9e1999b2e (diff) | |
| download | kernel_samsung_crespo-70268992c575948147c0e9c71d1e1ee0517a16ed.zip kernel_samsung_crespo-70268992c575948147c0e9c71d1e1ee0517a16ed.tar.gz kernel_samsung_crespo-70268992c575948147c0e9c71d1e1ee0517a16ed.tar.bz2 | |
Merge commit '85ce022' into HEAD
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/truncate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/truncate.c b/mm/truncate.c index e13f22e..3e9829f 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -398,11 +398,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); |