diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-03-27 08:06:26 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-04-23 00:05:09 -0400 |
commit | 97e7e0f71d6d948c25f11f0a33878d9356d9579e (patch) | |
tree | 2db3bcf3b4f47995308187eec7f3a61d67446dfa /fs/pnode.c | |
parent | 2d4d4864ac08caff5c204a752bd004eed4f08760 (diff) |
[patch 7/7] vfs: mountinfo: show dominating group id
Show peer group ID of nearest dominating group that has intersection
with the mount's namespace.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pnode.c')
-rw-r--r-- | fs/pnode.c | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index d18d66491a01..8d5f392ec3d3 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
@@ -28,6 +28,57 @@ static inline struct vfsmount *next_slave(struct vfsmount *p) | |||
28 | return list_entry(p->mnt_slave.next, struct vfsmount, mnt_slave); | 28 | return list_entry(p->mnt_slave.next, struct vfsmount, mnt_slave); |
29 | } | 29 | } |
30 | 30 | ||
31 | /* | ||
32 | * Return true if path is reachable from root | ||
33 | * | ||
34 | * namespace_sem is held, and mnt is attached | ||
35 | */ | ||
36 | static bool is_path_reachable(struct vfsmount *mnt, struct dentry *dentry, | ||
37 | const struct path *root) | ||
38 | { | ||
39 | while (mnt != root->mnt && mnt->mnt_parent != mnt) { | ||
40 | dentry = mnt->mnt_mountpoint; | ||
41 | mnt = mnt->mnt_parent; | ||
42 | } | ||
43 | return mnt == root->mnt && is_subdir(dentry, root->dentry); | ||
44 | } | ||
45 | |||
46 | static struct vfsmount *get_peer_under_root(struct vfsmount *mnt, | ||
47 | struct mnt_namespace *ns, | ||
48 | const struct path *root) | ||
49 | { | ||
50 | struct vfsmount *m = mnt; | ||
51 | |||
52 | do { | ||
53 | /* Check the namespace first for optimization */ | ||
54 | if (m->mnt_ns == ns && is_path_reachable(m, m->mnt_root, root)) | ||
55 | return m; | ||
56 | |||
57 | m = next_peer(m); | ||
58 | } while (m != mnt); | ||
59 | |||
60 | return NULL; | ||
61 | } | ||
62 | |||
63 | /* | ||
64 | * Get ID of closest dominating peer group having a representative | ||
65 | * under the given root. | ||
66 | * | ||
67 | * Caller must hold namespace_sem | ||
68 | */ | ||
69 | int get_dominating_id(struct vfsmount *mnt, const struct path *root) | ||
70 | { | ||
71 | struct vfsmount *m; | ||
72 | |||
73 | for (m = mnt->mnt_master; m != NULL; m = m->mnt_master) { | ||
74 | struct vfsmount *d = get_peer_under_root(m, mnt->mnt_ns, root); | ||
75 | if (d) | ||
76 | return d->mnt_group_id; | ||
77 | } | ||
78 | |||
79 | return 0; | ||
80 | } | ||
81 | |||
31 | static int do_make_slave(struct vfsmount *mnt) | 82 | static int do_make_slave(struct vfsmount *mnt) |
32 | { | 83 | { |
33 | struct vfsmount *peer_mnt = mnt, *master = mnt->mnt_master; | 84 | struct vfsmount *peer_mnt = mnt, *master = mnt->mnt_master; |