From: Bryan Schumaker <bjschuma@netapp.com>
Date: Fri, 7 Oct 2011 17:41:15 +0000 (-0400)
Subject: vfs: add "device" tag to /proc/self/mountstats
X-Git-Tag: firefly_0821_release~7541^2~2465
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2f8c09acae88d1bf0aeedffd3f788eb5c5b4db29;p=firefly-linux-kernel-4.4.55.git

vfs: add "device" tag to /proc/self/mountstats

commit a877ee03ac010ded434b77f7831f43cbb1fcc60f upstream.

nfsiostat was failing to find mounted filesystems on kernels after
2.6.38 because of changes to show_vfsstat() by commit
c7f404b40a3665d9f4e9a927cc5c1ee0479ed8f9.  This patch adds back the
"device" tag before the nfs server entry so scripts can parse the
mountstats file correctly.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/fs/namespace.c b/fs/namespace.c
index fe59bd145d21..304a55d0aa82 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1109,6 +1109,7 @@ static int show_vfsstat(struct seq_file *m, void *v)
 
 	/* device */
 	if (mnt->mnt_sb->s_op->show_devname) {
+		seq_puts(m, "device ");
 		err = mnt->mnt_sb->s_op->show_devname(m, mnt);
 	} else {
 		if (mnt->mnt_devname) {