X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Fnsproxy.h;h=189e0dc993ab6ab84a577d1ee0635946ec077072;hb=f7e4217b007d1f73e7e3cf10ba4fea4a608c603f;hp=678e1d38effba0866464ec560639fe07aaa929fa;hpb=8c8c4bafc3a20a6fb9078315ff865bc42276f9ba;p=powerpc.git

diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index 678e1d38ef..189e0dc993 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -31,34 +31,27 @@ struct nsproxy {
 };
 extern struct nsproxy init_nsproxy;
 
-struct nsproxy *dup_namespaces(struct nsproxy *orig);
 int copy_namespaces(int flags, struct task_struct *tsk);
 void get_task_namespaces(struct task_struct *tsk);
 void free_nsproxy(struct nsproxy *ns);
-struct nsproxy *put_nsproxy(struct nsproxy *ns);
+int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **,
+	struct fs_struct *);
 
-static inline void finalize_put_nsproxy(struct nsproxy *ns)
+static inline void put_nsproxy(struct nsproxy *ns)
 {
-	if (ns)
+	if (atomic_dec_and_test(&ns->count)) {
 		free_nsproxy(ns);
+	}
 }
 
-static inline void put_and_finalize_nsproxy(struct nsproxy *ns)
+static inline void exit_task_namespaces(struct task_struct *p)
 {
-	finalize_put_nsproxy(put_nsproxy(ns));
-}
-
-static inline struct nsproxy *preexit_task_namespaces(struct task_struct *p)
-{
-	return put_nsproxy(p->nsproxy);
-}
-
-static inline void exit_task_namespaces(struct task_struct *p,
-						struct nsproxy *ns)
-{
-	task_lock(p);
-	p->nsproxy = NULL;
-	task_unlock(p);
-	finalize_put_nsproxy(ns);
+	struct nsproxy *ns = p->nsproxy;
+	if (ns) {
+		task_lock(p);
+		p->nsproxy = NULL;
+		task_unlock(p);
+		put_nsproxy(ns);
+	}
 }
 #endif