Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / include / linux / utsname.h

diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index 69f3997..4e5b021 100644 (file)
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -37,9 +37,13 @@ struct new_utsname {
 #include <linux/nsproxy.h>
 #include <linux/err.h>
 
+struct user_namespace;
+extern struct user_namespace init_user_ns;
+
 struct uts_namespace {
        struct kref kref;
        struct new_utsname name;
+       struct user_namespace *user_ns;
 };
 extern struct uts_namespace init_uts_ns;
 
@@ -50,7 +54,7 @@ static inline void get_uts_ns(struct uts_namespace *ns)
 }
 
 extern struct uts_namespace *copy_utsname(unsigned long flags,
-                                       struct uts_namespace *ns);
+                                         struct task_struct *tsk);
 extern void free_uts_ns(struct kref *kref);
 
 static inline void put_uts_ns(struct uts_namespace *ns)
@@ -67,12 +71,12 @@ static inline void put_uts_ns(struct uts_namespace *ns)
 }
 
 static inline struct uts_namespace *copy_utsname(unsigned long flags,
-                                       struct uts_namespace *ns)
+                                                struct task_struct *tsk)
 {
        if (flags & CLONE_NEWUTS)
                return ERR_PTR(-EINVAL);
 
-       return ns;
+       return tsk->nsproxy->uts_ns;
 }
 #endif