summaryrefslogtreecommitdiff
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2008-03-27 15:06:26 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2008-04-23 08:05:09 +0400
commit97e7e0f71d6d948c25f11f0a33878d9356d9579e (patch)
tree2db3bcf3b4f47995308187eec7f3a61d67446dfa /fs/namespace.c
parent2d4d4864ac08caff5c204a752bd004eed4f08760 (diff)
downloadlinux-97e7e0f71d6d948c25f11f0a33878d9356d9579e.tar.xz
[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/namespace.c')
-rw-r--r--fs/namespace.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index c807b8d5f891..0505fb61aa74 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -850,8 +850,13 @@ static int show_mountinfo(struct seq_file *m, void *v)
/* Tagged fields ("foo:X" or "bar") */
if (IS_MNT_SHARED(mnt))
seq_printf(m, " shared:%i", mnt->mnt_group_id);
- if (IS_MNT_SLAVE(mnt))
- seq_printf(m, " master:%i", mnt->mnt_master->mnt_group_id);
+ if (IS_MNT_SLAVE(mnt)) {
+ int master = mnt->mnt_master->mnt_group_id;
+ int dom = get_dominating_id(mnt, &p->root);
+ seq_printf(m, " master:%i", master);
+ if (dom && dom != master)
+ seq_printf(m, " propagate_from:%i", dom);
+ }
if (IS_MNT_UNBINDABLE(mnt))
seq_puts(m, " unbindable");