diff options
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r-- | kernel/nsproxy.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index 7b05bce75cde..f5b9ee6f6bbb 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c | |||
@@ -117,7 +117,7 @@ int copy_namespaces(int flags, struct task_struct *tsk) | |||
117 | goto out_pid; | 117 | goto out_pid; |
118 | 118 | ||
119 | out: | 119 | out: |
120 | put_and_finalize_nsproxy(old_ns); | 120 | put_nsproxy(old_ns); |
121 | return err; | 121 | return err; |
122 | 122 | ||
123 | out_pid: | 123 | out_pid: |
@@ -135,20 +135,6 @@ out_ns: | |||
135 | goto out; | 135 | goto out; |
136 | } | 136 | } |
137 | 137 | ||
138 | struct nsproxy *put_nsproxy(struct nsproxy *ns) | ||
139 | { | ||
140 | if (ns) { | ||
141 | if (atomic_dec_and_test(&ns->count)) { | ||
142 | if (ns->mnt_ns) { | ||
143 | put_mnt_ns(ns->mnt_ns); | ||
144 | ns->mnt_ns = NULL; | ||
145 | } | ||
146 | return ns; | ||
147 | } | ||
148 | } | ||
149 | return NULL; | ||
150 | } | ||
151 | |||
152 | void free_nsproxy(struct nsproxy *ns) | 138 | void free_nsproxy(struct nsproxy *ns) |
153 | { | 139 | { |
154 | if (ns->mnt_ns) | 140 | if (ns->mnt_ns) |