2 files changed, 6 insertions, 9 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index a1ddd2557af2..e1b23fda48de 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -573,17 +573,14 @@ EXPORT_SYMBOL(wait_on_page_bit);
  * mechananism between PageLocked pages and PageWriteback pages is shared.
  * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep.
  *
- * The first mb is necessary to safely close the critical section opened by the
- * test_and_set_bit() to lock the page; the second mb is necessary to enforce
- * ordering between the clear_bit and the read of the waitqueue (to avoid SMP
- * races with a parallel wait_on_page_locked()).
+ * The mb is necessary to enforce ordering between the clear_bit and the read
+ * of the waitqueue (to avoid SMP races with a parallel wait_on_page_locked()).
  */
 void unlock_page(struct page *page)
 {
-        smp_mb__before_clear_bit();
-        if (!test_and_clear_bit(PG_locked, &page->flags))
-                BUG();
-        smp_mb__after_clear_bit(); 
+        VM_BUG_ON(!PageLocked(page));
+        clear_bit_unlock(PG_locked, &page->flags);
+        smp_mb__after_clear_bit();
         wake_up_page(page, PG_locked);
 }
 EXPORT_SYMBOL(unlock_page);
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 2a97fafa3d89..90cb67a5417c 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -422,7 +422,7 @@ void free_swap_and_cache(swp_entry_t entry)
         if (p) {
                 if (swap_entry_free(p, swp_offset(entry)) == 1) {
                         page = find_get_page(&swapper_space, entry.val);
-                        if (page && unlikely(!trylock_page(page))) {
+                        if (page && !trylock_page(page)) {
                                 page_cache_release(page);
                                 page = NULL;
                         }