2006-01-17 14:52:18

by Serge E. Hallyn

Subject: RFC [patch 08/34] PID Virtualization Change pid accesses: mm/

Change pid accesses for mm/.

Signed-off-by: Dave Hansen <[email protected]>
Signed-off-by: Serge Hallyn <[email protected]>
---
nommu.c | 14 +++++++-------
oom_kill.c | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)

Index: linux-2.6.15/mm/nommu.c
===================================================================
--- linux-2.6.15.orig/mm/nommu.c 2006-01-17 08:36:28.000000000 -0500
+++ linux-2.6.15/mm/nommu.c 2006-01-17 08:37:00.000000000 -0500
@@ -264,7 +264,7 @@
{
struct vm_list_struct *vml;

- printk("Process blocks %d:", current->pid);
+ printk("Process blocks %d:", task_pid(current));

for (vml = &current->mm->context.vmlist; vml; vml = vml->next) {
printk(" %p: %p", vml, vml->vma);
@@ -380,7 +380,7 @@
if (flags & MAP_FIXED || addr) {
printk(KERN_DEBUG
"%d: Can't do fixed-address/overlay mmap of RAM\n",
- current->pid);
+ task_pid(current));
return -EINVAL;
}

@@ -626,7 +626,7 @@
#ifdef WARN_ON_SLACK
if (len + WARN_ON_SLACK <= kobjsize(result))
printk("Allocation of %lu bytes from process %d has %lu bytes of slack\n",
- len, current->pid, kobjsize(result) - len);
+ len, task_pid(current), kobjsize(result) - len);
#endif

if (vma->vm_file) {
@@ -663,7 +663,7 @@

enomem:
printk("Allocation of length %lu from process %d failed\n",
- len, current->pid);
+ len, task_pid(current));
show_free_areas();
return -ENOMEM;
}
@@ -855,13 +855,13 @@
up_write(&nommu_vma_sem);
kfree(vml);
printk("Allocation of vma for %lu byte allocation from process %d failed\n",
- len, current->pid);
+ len, task_pid(current));
show_free_areas();
return -ENOMEM;

error_getting_vml:
printk("Allocation of vml for %lu byte allocation from process %d failed\n",
- len, current->pid);
+ len, task_pid(current));
show_free_areas();
return -ENOMEM;
}
@@ -915,7 +915,7 @@
goto found;

printk("munmap of non-mmaped memory by process %d (%s): %p\n",
- current->pid, current->comm, (void *) addr);
+ task_pid(current), current->comm, (void *) addr);
return -EINVAL;

found:
Index: linux-2.6.15/mm/oom_kill.c
===================================================================
--- linux-2.6.15.orig/mm/oom_kill.c 2006-01-17 08:36:28.000000000 -0500
+++ linux-2.6.15/mm/oom_kill.c 2006-01-17 08:37:00.000000000 -0500
@@ -125,7 +125,7 @@

#ifdef DEBUG
printk(KERN_DEBUG "OOMkill: task %d (%s) got %d points\n",
- p->pid, p->comm, points);
+ task_pid(p), p->comm, points);
#endif
return points;
}
@@ -149,7 +149,7 @@
int releasing;

/* skip the init task with pid == 1 */
- if (p->pid == 1)
+ if (task_pid(p) == 1)
continue;
if (p->oomkilladj == OOM_DISABLE)
continue;
@@ -184,7 +184,7 @@
*/
static void __oom_kill_task(task_t *p)
{
- if (p->pid == 1) {
+ if (task_pid(p) == 1) {
WARN_ON(1);
printk(KERN_WARNING "tried to kill init!\n");
return;
@@ -199,7 +199,7 @@
}
task_unlock(p);
printk(KERN_ERR "Out of Memory: Killed process %d (%s).\n",
- p->pid, p->comm);
+ task_pid(p), p->comm);

/*
* We give our sacrificial lamb high priority and access to
@@ -230,7 +230,7 @@
* but are in a different thread group
*/
do_each_thread(g, q)
- if (q->mm == mm && q->tgid != p->tgid)
+ if (q->mm == mm && task_tgid(q) != task_tgid(p))
__oom_kill_task(q);
while_each_thread(g, q);


--