diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-07-07 17:54:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 12:31:56 -0400 |
| commit | b43f3cbd21ffbd719fd4fa6642bfe6af255ded34 (patch) | |
| tree | f09372f7aa3057a4cca32d5c7fc19032bd7cda5a /include | |
| parent | 622f8061a68d3f7a576c20a47b7f3bae7c8cfbef (diff) | |
headers: mnt_namespace.h redux
Fix various silly problems wrt mnt_namespace.h:
- exit_mnt_ns() isn't used, remove it
- done that, sched.h and nsproxy.h inclusions aren't needed
- mount.h inclusion was need for vfsmount_lock, but no longer
- remove mnt_namespace.h inclusion from files which don't use anything
from mnt_namespace.h
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mnt_namespace.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h index 3beb2592b03f..d74785c2393a 100644 --- a/include/linux/mnt_namespace.h +++ b/include/linux/mnt_namespace.h | |||
| @@ -2,10 +2,9 @@ | |||
| 2 | #define _NAMESPACE_H_ | 2 | #define _NAMESPACE_H_ |
| 3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
| 4 | 4 | ||
| 5 | #include <linux/mount.h> | 5 | #include <linux/path.h> |
| 6 | #include <linux/sched.h> | ||
| 7 | #include <linux/nsproxy.h> | ||
| 8 | #include <linux/seq_file.h> | 6 | #include <linux/seq_file.h> |
| 7 | #include <linux/wait.h> | ||
| 9 | 8 | ||
| 10 | struct mnt_namespace { | 9 | struct mnt_namespace { |
| 11 | atomic_t count; | 10 | atomic_t count; |
| @@ -28,14 +27,6 @@ extern struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt); | |||
| 28 | extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, | 27 | extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, |
| 29 | struct fs_struct *); | 28 | struct fs_struct *); |
| 30 | extern void put_mnt_ns(struct mnt_namespace *ns); | 29 | extern void put_mnt_ns(struct mnt_namespace *ns); |
| 31 | |||
| 32 | static inline void exit_mnt_ns(struct task_struct *p) | ||
| 33 | { | ||
| 34 | struct mnt_namespace *ns = p->nsproxy->mnt_ns; | ||
| 35 | if (ns) | ||
| 36 | put_mnt_ns(ns); | ||
| 37 | } | ||
| 38 | |||
| 39 | static inline void get_mnt_ns(struct mnt_namespace *ns) | 30 | static inline void get_mnt_ns(struct mnt_namespace *ns) |
| 40 | { | 31 | { |
| 41 | atomic_inc(&ns->count); | 32 | atomic_inc(&ns->count); |
