Merge tag 'regulator-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / fs / proc / fd.c

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 985ea881b5bc489aa7ae0657e23fbe23d650d844..0788d093f5d86ace99ad80f68f4d7bd924eff294 100644 (file)
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -11,6 +11,7 @@
 
 #include <linux/proc_fs.h>
 
+#include "../mount.h"
 #include "internal.h"
 #include "fd.h"
 
@@ -48,8 +49,9 @@ static int seq_show(struct seq_file *m, void *v)
        }
 
        if (!ret) {
-                seq_printf(m, "pos:\t%lli\nflags:\t0%o\n",
-                          (long long)file->f_pos, f_flags);
+               seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
+                          (long long)file->f_pos, f_flags,
+                          real_mount(file->f_path.mnt)->mnt_id);
                if (file->f_op->show_fdinfo)
                        ret = file->f_op->show_fdinfo(m, file);
                fput(file);