10 files changed, 22 insertions, 22 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index d97d1ad55473..54e968650855 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -558,14 +558,14 @@ EXPORT_SYMBOL(wait_on_page_bit);
  * 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
- * TestSetPageLocked(), 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()).
+ * 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()).
  */
 void unlock_page(struct page *page)
 {
         smp_mb__before_clear_bit();
-        if (!TestClearPageLocked(page))
+        if (!test_and_clear_bit(PG_locked, &page->flags))
                 BUG();
         smp_mb__after_clear_bit(); 
         wake_up_page(page, PG_locked);
@@ -931,7 +931,7 @@ grab_cache_page_nowait(struct address_space *mapping, pgoff_t index)
         struct page *page = find_get_page(mapping, index);
 
         if (page) {
-                if (!TestSetPageLocked(page))
+                if (trylock_page(page))
                         return page;
                 page_cache_release(page);
                 return NULL;
@@ -1027,7 +1027,7 @@ find_page:
                         if (inode->i_blkbits == PAGE_CACHE_SHIFT ||
                                         !mapping->a_ops->is_partially_uptodate)
                                 goto page_not_up_to_date;
-                        if (TestSetPageLocked(page))
+                        if (!trylock_page(page))
                                 goto page_not_up_to_date;
                         if (!mapping->a_ops->is_partially_uptodate(page,
                                                                 desc, offset))
diff --git a/mm/memory.c b/mm/memory.c
index a472bcd4b061..1002f473f497 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1789,7 +1789,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
          * not dirty accountable.
          */
         if (PageAnon(old_page)) {
-                if (!TestSetPageLocked(old_page)) {
+                if (trylock_page(old_page)) {
                         reuse = can_share_swap_page(old_page);
                         unlock_page(old_page);
                 }
diff --git a/mm/migrate.c b/mm/migrate.c
index 153572fb60b8..2a80136b23bb 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -605,7 +605,7 @@ static int move_to_new_page(struct page *newpage, struct page *page)
          * establishing additional references. We are the only one
          * holding a reference to the new page at this point.
          */
-        if (TestSetPageLocked(newpage))
+        if (!trylock_page(newpage))
                 BUG();
 
         /* Prepare mapping for the new page.*/
@@ -667,7 +667,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
         BUG_ON(charge);
 
         rc = -EAGAIN;
-        if (TestSetPageLocked(page)) {
+        if (!trylock_page(page)) {
                 if (!force)
                         goto move_newpage;
                 lock_page(page);
diff --git a/mm/rmap.c b/mm/rmap.c
index 94a5246a3f98..1ea4e6fcee77 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -422,7 +422,7 @@ int page_referenced(struct page *page, int is_locked,
                         referenced += page_referenced_anon(page, mem_cont);
                 else if (is_locked)
                         referenced += page_referenced_file(page, mem_cont);
-                else if (TestSetPageLocked(page))
+                else if (!trylock_page(page))
                         referenced++;
                 else {
                         if (page->mapping)
diff --git a/mm/shmem.c b/mm/shmem.c
index c1e5a3b4f758..04fb4f1ab88e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1265,7 +1265,7 @@ repeat:
                 }
 
                 /* We have to do this with page locked to prevent races */
-                if (TestSetPageLocked(swappage)) {
+                if (!trylock_page(swappage)) {
                         shmem_swp_unmap(entry);
                         spin_unlock(&info->lock);
                         wait_on_page_locked(swappage);
@@ -1329,7 +1329,7 @@ repeat:
                 shmem_swp_unmap(entry);
                 filepage = find_get_page(mapping, idx);
                 if (filepage &&
-                    (!PageUptodate(filepage) || TestSetPageLocked(filepage))) {
+                    (!PageUptodate(filepage) || !trylock_page(filepage))) {
                         spin_unlock(&info->lock);
                         wait_on_page_locked(filepage);
                         page_cache_release(filepage);
diff --git a/mm/swap.c b/mm/swap.c
index 7417a2adbe50..9e0cb3118079 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -444,7 +444,7 @@ void pagevec_strip(struct pagevec *pvec)
         for (i = 0; i < pagevec_count(pvec); i++) {
                 struct page *page = pvec->pages[i];
 
-                if (PagePrivate(page) && !TestSetPageLocked(page)) {
+                if (PagePrivate(page) && trylock_page(page)) {
                         if (PagePrivate(page))
                                 try_to_release_page(page, 0);
                         unlock_page(page);
diff --git a/mm/swap_state.c b/mm/swap_state.c
index b8035b055129..167cf2dc8a03 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -201,7 +201,7 @@ void delete_from_swap_cache(struct page *page)
  */
 static inline void free_swap_cache(struct page *page)
 {
-        if (PageSwapCache(page) && !TestSetPageLocked(page)) {
+        if (PageSwapCache(page) && trylock_page(page)) {
                 remove_exclusive_swap_page(page);
                 unlock_page(page);
         }
@@ -302,9 +302,9 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                  * re-using the just freed swap entry for an existing page.
                  * May fail (-ENOMEM) if radix-tree node allocation failed.
                  */
-                SetPageLocked(new_page);
+                set_page_locked(new_page);
                 err = add_to_swap_cache(new_page, entry, gfp_mask & GFP_KERNEL);
-                if (!err) {
+                if (likely(!err)) {
                         /*
                          * Initiate read into locked page and return.
                          */
@@ -312,7 +312,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                         swap_readpage(NULL, new_page);
                         return new_page;
                 }
-                ClearPageLocked(new_page);
+                clear_page_locked(new_page);
                 swap_free(entry);
         } while (err != -ENOMEM);
 
diff --git a/mm/swapfile.c b/mm/swapfile.c
index bb7f79641f9e..1e330f2998fa 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -403,7 +403,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(TestSetPageLocked(page))) {
+                        if (page && unlikely(!trylock_page(page))) {
                                 page_cache_release(page);
                                 page = NULL;
                         }
diff --git a/mm/truncate.c b/mm/truncate.c
index 894e9a70699f..250505091d37 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -187,7 +187,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
                         if (page_index > next)
                                 next = page_index;
                         next++;
-                        if (TestSetPageLocked(page))
+                        if (!trylock_page(page))
                                 continue;
                         if (PageWriteback(page)) {
                                 unlock_page(page);
@@ -280,7 +280,7 @@ unsigned long __invalidate_mapping_pages(struct address_space *mapping,
                         pgoff_t index;
                         int lock_failed;
 
-                        lock_failed = TestSetPageLocked(page);
+                        lock_failed = !trylock_page(page);
 
                         /*
                          * We really shouldn't be looking at the ->index of an
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 75be453628bf..1ff1a58e7c10 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -496,7 +496,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
                 page = lru_to_page(page_list);
                 list_del(&page->lru);
 
-                if (TestSetPageLocked(page))
+                if (!trylock_page(page))
                         goto keep;
 
                 VM_BUG_ON(PageActive(page));
@@ -582,7 +582,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
                                  * A synchronous write - probably a ramdisk.  Go
                                  * ahead and try to reclaim the page.
                                  */
-                                if (TestSetPageLocked(page))
+                                if (!trylock_page(page))
                                         goto keep;
                                 if (PageDirty(page) || PageWriteback(page))
                                         goto keep_locked;