1 files changed, 2 insertions, 2 deletions

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);