Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index c807b8d5f89176aba3c927839a89a3fd51fa5b35..0505fb61aa740182cfabe890cc668724378c5791 100644 (file)
--- 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");