diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:53 -0500 |
| commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
| tree | e075e4d5534193f28e6059904f61e5ca03958d3c /fs/namespace.c | |
| parent | 4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff) | |
| parent | 52e4c2a05256cb83cda12f3c2137ab1533344edb (diff) | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 9a1ddcda655f..10a426c6a701 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -1107,6 +1107,7 @@ static int show_vfsstat(struct seq_file *m, void *v) | |||
| 1107 | 1107 | ||
| 1108 | /* device */ | 1108 | /* device */ |
| 1109 | if (mnt->mnt_sb->s_op->show_devname) { | 1109 | if (mnt->mnt_sb->s_op->show_devname) { |
| 1110 | seq_puts(m, "device "); | ||
| 1110 | err = mnt->mnt_sb->s_op->show_devname(m, mnt); | 1111 | err = mnt->mnt_sb->s_op->show_devname(m, mnt); |
| 1111 | } else { | 1112 | } else { |
| 1112 | if (mnt->mnt_devname) { | 1113 | if (mnt->mnt_devname) { |