projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sata_sil24: kill unused local variable idx in sil24_fill_sg()
[powerpc.git]
/
kernel
/
nsproxy.c
diff --git
a/kernel/nsproxy.c
b/kernel/nsproxy.c
index
7b05bce
..
f5b9ee6
100644
(file)
--- a/
kernel/nsproxy.c
+++ b/
kernel/nsproxy.c
@@
-117,7
+117,7
@@
int copy_namespaces(int flags, struct task_struct *tsk)
goto out_pid;
out:
goto out_pid;
out:
- put_
and_finalize_
nsproxy(old_ns);
+ put_nsproxy(old_ns);
return err;
out_pid:
return err;
out_pid:
@@
-135,20
+135,6
@@
out_ns:
goto out;
}
goto out;
}
-struct nsproxy *put_nsproxy(struct nsproxy *ns)
-{
- if (ns) {
- if (atomic_dec_and_test(&ns->count)) {
- if (ns->mnt_ns) {
- put_mnt_ns(ns->mnt_ns);
- ns->mnt_ns = NULL;
- }
- return ns;
- }
- }
- return NULL;
-}
-
void free_nsproxy(struct nsproxy *ns)
{
if (ns->mnt_ns)
void free_nsproxy(struct nsproxy *ns)
{
if (ns->mnt_ns)