aboutsummaryrefslogtreecommitdiffstats
path: root/mm/frame_vector.c
diff options
context:
space:
mode:
authorLorenzo Stoakes <lstoakes@gmail.com>2016-10-12 20:20:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-19 11:11:05 -0400
commit3b913179c3fa89dd0e304193fa0c746fc0481447 (patch)
tree9d19f80b42aa94ccdd93d926332aee9881ac439b /mm/frame_vector.c
parentc164154f66f0c9b02673f07aa4f044f1d9c70274 (diff)
mm: replace get_user_pages_locked() write/force parameters with gup_flags
This removes the 'write' and 'force' use from get_user_pages_locked() and replaces them with 'gup_flags' to make the use of FOLL_FORCE explicit in callers as use of this flag can result in surprising behaviour (and hence bugs) within the mm subsystem. Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/frame_vector.c')
-rw-r--r--mm/frame_vector.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/mm/frame_vector.c b/mm/frame_vector.c
index 381bb07ed14f..81b67498bb9c 100644
--- a/mm/frame_vector.c
+++ b/mm/frame_vector.c
@@ -41,10 +41,16 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
41 int ret = 0; 41 int ret = 0;
42 int err; 42 int err;
43 int locked; 43 int locked;
44 unsigned int gup_flags = 0;
44 45
45 if (nr_frames == 0) 46 if (nr_frames == 0)
46 return 0; 47 return 0;
47 48
49 if (write)
50 gup_flags |= FOLL_WRITE;
51 if (force)
52 gup_flags |= FOLL_FORCE;
53
48 if (WARN_ON_ONCE(nr_frames > vec->nr_allocated)) 54 if (WARN_ON_ONCE(nr_frames > vec->nr_allocated))
49 nr_frames = vec->nr_allocated; 55 nr_frames = vec->nr_allocated;
50 56
@@ -59,7 +65,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
59 vec->got_ref = true; 65 vec->got_ref = true;
60 vec->is_pfns = false; 66 vec->is_pfns = false;
61 ret = get_user_pages_locked(start, nr_frames, 67 ret = get_user_pages_locked(start, nr_frames,
62 write, force, (struct page **)(vec->ptrs), &locked); 68 gup_flags, (struct page **)(vec->ptrs), &locked);
63 goto out; 69 goto out;
64 } 70 }
65 71