vfs: add "device" tag to /proc/self/mountstats
authorBryan Schumaker <bjschuma@netapp.com>
Fri, 7 Oct 2011 17:41:15 +0000 (13:41 -0400)
committerChristoph Hellwig <hch@serles.lst.de>
Fri, 28 Oct 2011 11:55:08 +0000 (13:55 +0200)
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>
CC: stable@kernel.org [>=2.6.39]
Signed-off-by: Christoph Hellwig <hch@lst.de>
fs/namespace.c

index b4febb29d3bb3d855793daa1b3f07cb303e1f6ea..e5e1c7d1839b791f0c52428a9ffe058bd7ded092 100644 (file)
@@ -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) {