aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/super.c4
-rw-r--r--fs/proc_namespace.c2
-rw-r--r--include/linux/fs.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 6e6faa17bd38..02c693c77ab7 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -264,7 +264,7 @@ static void nfs_umount_begin(struct super_block *);
264static int nfs_statfs(struct dentry *, struct kstatfs *); 264static int nfs_statfs(struct dentry *, struct kstatfs *);
265static int nfs_show_options(struct seq_file *, struct vfsmount *); 265static int nfs_show_options(struct seq_file *, struct vfsmount *);
266static int nfs_show_devname(struct seq_file *, struct dentry *); 266static int nfs_show_devname(struct seq_file *, struct dentry *);
267static int nfs_show_path(struct seq_file *, struct vfsmount *); 267static int nfs_show_path(struct seq_file *, struct dentry *);
268static int nfs_show_stats(struct seq_file *, struct dentry *); 268static int nfs_show_stats(struct seq_file *, struct dentry *);
269static struct dentry *nfs_fs_mount(struct file_system_type *, 269static struct dentry *nfs_fs_mount(struct file_system_type *,
270 int, const char *, void *); 270 int, const char *, void *);
@@ -776,7 +776,7 @@ static int nfs_show_devname(struct seq_file *m, struct dentry *root)
776 return err; 776 return err;
777} 777}
778 778
779static int nfs_show_path(struct seq_file *m, struct vfsmount *mnt) 779static int nfs_show_path(struct seq_file *m, struct dentry *dentry)
780{ 780{
781 seq_puts(m, "/"); 781 seq_puts(m, "/");
782 return 0; 782 return 0;
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 6d4583ddbeda..8f8304b3f98a 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -131,7 +131,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
131 seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id, 131 seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
132 MAJOR(sb->s_dev), MINOR(sb->s_dev)); 132 MAJOR(sb->s_dev), MINOR(sb->s_dev));
133 if (sb->s_op->show_path) 133 if (sb->s_op->show_path)
134 err = sb->s_op->show_path(m, mnt); 134 err = sb->s_op->show_path(m, mnt->mnt_root);
135 else 135 else
136 seq_dentry(m, mnt->mnt_root, " \t\n\\"); 136 seq_dentry(m, mnt->mnt_root, " \t\n\\");
137 if (err) 137 if (err)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a8dff43d1b9d..13721b073407 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1674,7 +1674,7 @@ struct super_operations {
1674 1674
1675 int (*show_options)(struct seq_file *, struct vfsmount *); 1675 int (*show_options)(struct seq_file *, struct vfsmount *);
1676 int (*show_devname)(struct seq_file *, struct dentry *); 1676 int (*show_devname)(struct seq_file *, struct dentry *);
1677 int (*show_path)(struct seq_file *, struct vfsmount *); 1677 int (*show_path)(struct seq_file *, struct dentry *);
1678 int (*show_stats)(struct seq_file *, struct dentry *); 1678 int (*show_stats)(struct seq_file *, struct dentry *);
1679#ifdef CONFIG_QUOTA 1679#ifdef CONFIG_QUOTA
1680 ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); 1680 ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);