aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-09-27 01:50:16 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:26:14 -0700
commit0159b141d8b1f9b9f9cffacae47bec1e05c63b8b (patch)
tree2555ce3afb2307b4532be4247d1f87e06f0071d0
parent5da6185bca064e35aa73a7c1f27488d2b96434f4 (diff)
[PATCH] NOMMU: Use find_vma() rather than reimplementing a VMA search
Use find_vma() in the NOMMU version of access_process_vm() rather than reimplementing it. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--mm/nommu.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index d08acdae003..00ffa974c90 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1039,6 +1039,7 @@ unsigned long do_mremap(unsigned long addr,
/*
* Look up the first VMA which satisfies addr < vm_end, NULL if none
+ * - should be called with mm->mmap_sem at least readlocked
*/
struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
{
@@ -1213,7 +1214,6 @@ struct page *filemap_nopage(struct vm_area_struct *area,
*/
int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
{
- struct vm_list_struct *vml;
struct vm_area_struct *vma;
struct mm_struct *mm;
@@ -1227,13 +1227,8 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in
down_read(&mm->mmap_sem);
/* the access must start within one of the target process's mappings */
- for (vml = mm->context.vmlist; vml; vml = vml->next)
- if (addr >= vml->vma->vm_start && addr < vml->vma->vm_end)
- break;
-
- if (vml) {
- vma = vml->vma;
-
+ vma = find_vma(mm, addr);
+ if (vma) {
/* don't overrun this mapping */
if (addr + len >= vma->vm_end)
len = vma->vm_end - addr;