[Xen-devel] [PATCH v2 24/34] futex: convert put_page() to put_user_page*()

[john.hubbard@xxxxxxxxx]

From: John Hubbard <jhubbard@xxxxxxxxxx>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Darren Hart <dvhart@xxxxxxxxxxxxx>
Signed-off-by: John Hubbard <jhubbard@xxxxxxxxxx>
---
 kernel/futex.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index 6d50728ef2e7..4b4cae58ec57 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -623,7 +623,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union 
futex_key *key, enum futex_a
                lock_page(page);
                shmem_swizzled = PageSwapCache(page) || page->mapping;
                unlock_page(page);
-               put_page(page);
+               put_user_page(page);
 
                if (shmem_swizzled)
                        goto again;
@@ -675,7 +675,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union 
futex_key *key, enum futex_a
 
                if (READ_ONCE(page->mapping) != mapping) {
                        rcu_read_unlock();
-                       put_page(page);
+                       put_user_page(page);
 
                        goto again;
                }
@@ -683,7 +683,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union 
futex_key *key, enum futex_a
                inode = READ_ONCE(mapping->host);
                if (!inode) {
                        rcu_read_unlock();
-                       put_page(page);
+                       put_user_page(page);
 
                        goto again;
                }
@@ -702,7 +702,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union 
futex_key *key, enum futex_a
                 */
                if (!atomic_inc_not_zero(&inode->i_count)) {
                        rcu_read_unlock();
-                       put_page(page);
+                       put_user_page(page);
 
                        goto again;
                }
@@ -723,7 +723,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union 
futex_key *key, enum futex_a
        }
 
 out:
-       put_page(page);
+       put_user_page(page);
        return err;
 }
 
-- 
2.22.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel