untangling process_vm_..., part 3

[pandora-kernel.git] / mm / process_vm_access.c

diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index 7b8d63e..40dfb39 100644 (file)
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -45,7 +45,7 @@ static int process_vm_rw_pages(struct task_struct *task,
                               unsigned long pa,
                               unsigned long start_offset,
                               unsigned long len,
-                              const struct iovec *lvec,
+                              const struct iovec **iovp,
                               unsigned long lvec_cnt,
                               unsigned long *lvec_current,
                               size_t *lvec_offset,
@@ -60,7 +60,7 @@ static int process_vm_rw_pages(struct task_struct *task,
        int ret;
        ssize_t bytes_to_copy;
        ssize_t rc = 0;
-       const struct iovec *iov = lvec + *lvec_current;
+       const struct iovec *iov = *iovp;
 
        *bytes_copied = 0;
 
@@ -149,6 +149,7 @@ end:
                        put_page(process_pages[j]);
        }
 
+       *iovp = iov;
        return rc;
 }
 
@@ -173,7 +174,7 @@ end:
  */
 static int process_vm_rw_single_vec(unsigned long addr,
                                    unsigned long len,
-                                   const struct iovec *lvec,
+                                   const struct iovec **iovp,
                                    unsigned long lvec_cnt,
                                    unsigned long *lvec_current,
                                    size_t *lvec_offset,
@@ -206,7 +207,7 @@ static int process_vm_rw_single_vec(unsigned long addr,
 
                rc = process_vm_rw_pages(task, mm, process_pages, pa,
                                         start_offset, len,
-                                        lvec, lvec_cnt,
+                                        iovp, lvec_cnt,
                                         lvec_current, lvec_offset,
                                         vm_write, nr_pages_to_copy,
                                         &bytes_copied_loop);
@@ -317,7 +318,7 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
        for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
                rc = process_vm_rw_single_vec(
                        (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
-                       lvec, liovcnt, &iov_l_curr_idx, &iov_l_curr_offset,
+                       &lvec, liovcnt, &iov_l_curr_idx, &iov_l_curr_offset,
                        process_pages, mm, task, vm_write, &bytes_copied_loop);
                bytes_copied += bytes_copied_loop;
                if (rc != 0) {