diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-03-27 08:06:24 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-04-23 00:04:57 -0400 |
commit | a1a2c409b666befc58c2db9c7fbddf200f153470 (patch) | |
tree | 3ea8e4c8f1311436939492d70de23dcf185994de /include/linux/mnt_namespace.h | |
parent | 719f5d7f0b90ac2c8f8ca4232eb322b266fea01e (diff) |
[patch 5/7] vfs: mountinfo: allow using process root
Allow /proc/<pid>/mountinfo to use the root of <pid> to calculate
mountpoints.
- move definition of 'struct proc_mounts' to <linux/mnt_namespace.h>
- add the process's namespace and root to this structure
- pass a pointer to 'struct proc_mounts' into seq_operations
In addition the following cleanups are made:
- use a common open function for /proc/<pid>/{mounts,mountstat}
- surround namespace.c part of these proc files with #ifdef CONFIG_PROC_FS
- make the seq_operations structures const
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/mnt_namespace.h')
-rw-r--r-- | include/linux/mnt_namespace.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h index 8eed44f8ca73..c078aacc8116 100644 --- a/include/linux/mnt_namespace.h +++ b/include/linux/mnt_namespace.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/mount.h> | 5 | #include <linux/mount.h> |
6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
7 | #include <linux/nsproxy.h> | 7 | #include <linux/nsproxy.h> |
8 | #include <linux/seq_file.h> | ||
8 | 9 | ||
9 | struct mnt_namespace { | 10 | struct mnt_namespace { |
10 | atomic_t count; | 11 | atomic_t count; |
@@ -14,6 +15,13 @@ struct mnt_namespace { | |||
14 | int event; | 15 | int event; |
15 | }; | 16 | }; |
16 | 17 | ||
18 | struct proc_mounts { | ||
19 | struct seq_file m; /* must be the first element */ | ||
20 | struct mnt_namespace *ns; | ||
21 | struct path root; | ||
22 | int event; | ||
23 | }; | ||
24 | |||
17 | extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, | 25 | extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, |
18 | struct fs_struct *); | 26 | struct fs_struct *); |
19 | extern void __put_mnt_ns(struct mnt_namespace *ns); | 27 | extern void __put_mnt_ns(struct mnt_namespace *ns); |
@@ -37,5 +45,8 @@ static inline void get_mnt_ns(struct mnt_namespace *ns) | |||
37 | atomic_inc(&ns->count); | 45 | atomic_inc(&ns->count); |
38 | } | 46 | } |
39 | 47 | ||
48 | extern const struct seq_operations mounts_op; | ||
49 | extern const struct seq_operations mountstats_op; | ||
50 | |||
40 | #endif | 51 | #endif |
41 | #endif | 52 | #endif |