diff options
Diffstat (limited to 'include/linux/pid_namespace.h')
-rw-r--r-- | include/linux/pid_namespace.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index 0135c76c76c6..1689e28483e4 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h | |||
@@ -29,6 +29,7 @@ struct pid_namespace { | |||
29 | 29 | ||
30 | extern struct pid_namespace init_pid_ns; | 30 | extern struct pid_namespace init_pid_ns; |
31 | 31 | ||
32 | #ifdef CONFIG_PID_NS | ||
32 | static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns) | 33 | static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns) |
33 | { | 34 | { |
34 | if (ns != &init_pid_ns) | 35 | if (ns != &init_pid_ns) |
@@ -45,6 +46,28 @@ static inline void put_pid_ns(struct pid_namespace *ns) | |||
45 | kref_put(&ns->kref, free_pid_ns); | 46 | kref_put(&ns->kref, free_pid_ns); |
46 | } | 47 | } |
47 | 48 | ||
49 | #else /* !CONFIG_PID_NS */ | ||
50 | #include <linux/err.h> | ||
51 | |||
52 | static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns) | ||
53 | { | ||
54 | return ns; | ||
55 | } | ||
56 | |||
57 | static inline struct pid_namespace * | ||
58 | copy_pid_ns(unsigned long flags, struct pid_namespace *ns) | ||
59 | { | ||
60 | if (flags & CLONE_NEWPID) | ||
61 | ns = ERR_PTR(-EINVAL); | ||
62 | return ns; | ||
63 | } | ||
64 | |||
65 | static inline void put_pid_ns(struct pid_namespace *ns) | ||
66 | { | ||
67 | } | ||
68 | |||
69 | #endif /* CONFIG_PID_NS */ | ||
70 | |||
48 | static inline struct pid_namespace *task_active_pid_ns(struct task_struct *tsk) | 71 | static inline struct pid_namespace *task_active_pid_ns(struct task_struct *tsk) |
49 | { | 72 | { |
50 | return tsk->nsproxy->pid_ns; | 73 | return tsk->nsproxy->pid_ns; |