projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NFS: Kill the obsolete NFS_PARANOIA
[powerpc.git]
/
kernel
/
pid.c
diff --git
a/kernel/pid.c
b/kernel/pid.c
index
2efe9d8
..
d3ad724
100644
(file)
--- a/
kernel/pid.c
+++ b/
kernel/pid.c
@@
-197,7
+197,7
@@
fastcall void free_pid(struct pid *pid)
hlist_del_rcu(&pid->pid_chain);
spin_unlock_irqrestore(&pidmap_lock, flags);
hlist_del_rcu(&pid->pid_chain);
spin_unlock_irqrestore(&pidmap_lock, flags);
- free_pidmap(
current->nsproxy->
pid_ns, pid->nr);
+ free_pidmap(
&init_
pid_ns, pid->nr);
call_rcu(&pid->rcu, delayed_put_pid);
}
call_rcu(&pid->rcu, delayed_put_pid);
}
@@
-360,16
+360,11
@@
struct pid *find_ge_pid(int nr)
}
EXPORT_SYMBOL_GPL(find_get_pid);
}
EXPORT_SYMBOL_GPL(find_get_pid);
-
int copy_pid_ns(int flags, struct task_struct *tsk
)
+
struct pid_namespace *copy_pid_ns(int flags, struct pid_namespace *old_ns
)
{
{
- struct pid_namespace *old_ns = tsk->nsproxy->pid_ns;
- int err = 0;
-
- if (!old_ns)
- return 0;
-
+ BUG_ON(!old_ns);
get_pid_ns(old_ns);
get_pid_ns(old_ns);
- return
err
;
+ return
old_ns
;
}
void free_pid_ns(struct kref *kref)
}
void free_pid_ns(struct kref *kref)
@@
-412,7
+407,5
@@
void __init pidmap_init(void)
set_bit(0, init_pid_ns.pidmap[0].page);
atomic_dec(&init_pid_ns.pidmap[0].nr_free);
set_bit(0, init_pid_ns.pidmap[0].page);
atomic_dec(&init_pid_ns.pidmap[0].nr_free);
- pid_cachep = kmem_cache_create("pid", sizeof(struct pid),
- __alignof__(struct pid),
- SLAB_PANIC, NULL, NULL);
+ pid_cachep = KMEM_CACHE(pid, SLAB_PANIC);
}
}