diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-12-08 21:37:57 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-06 23:16:55 -0500 |
| commit | a6322de67b58a00e3a783ad9c87c2a11b2d67b47 (patch) | |
| tree | 526d8cb03b5f357bab06907eecad4c1d444a4934 | |
| parent | d861c630e99febe5ce6055290085556c5b714b06 (diff) | |
| download | olio-linux-3.10-a6322de67b58a00e3a783ad9c87c2a11b2d67b47.tar.xz olio-linux-3.10-a6322de67b58a00e3a783ad9c87c2a11b2d67b47.zip | |
vfs: switch ->show_path() to struct dentry *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/nfs/super.c | 4 | ||||
| -rw-r--r-- | fs/proc_namespace.c | 2 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 6e6faa17bd3..02c693c77ab 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -264,7 +264,7 @@ static void nfs_umount_begin(struct super_block *); static int nfs_statfs(struct dentry *, struct kstatfs *); static int nfs_show_options(struct seq_file *, struct vfsmount *); static int nfs_show_devname(struct seq_file *, struct dentry *); -static int nfs_show_path(struct seq_file *, struct vfsmount *); +static int nfs_show_path(struct seq_file *, struct dentry *); static int nfs_show_stats(struct seq_file *, struct dentry *); static struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, void *); @@ -776,7 +776,7 @@ static int nfs_show_devname(struct seq_file *m, struct dentry *root) return err; } -static int nfs_show_path(struct seq_file *m, struct vfsmount *mnt) +static int nfs_show_path(struct seq_file *m, struct dentry *dentry) { seq_puts(m, "/"); return 0; diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 6d4583ddbed..8f8304b3f98 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) seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id, MAJOR(sb->s_dev), MINOR(sb->s_dev)); if (sb->s_op->show_path) - err = sb->s_op->show_path(m, mnt); + err = sb->s_op->show_path(m, mnt->mnt_root); else seq_dentry(m, mnt->mnt_root, " \t\n\\"); if (err) diff --git a/include/linux/fs.h b/include/linux/fs.h index a8dff43d1b9..13721b07340 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1674,7 +1674,7 @@ struct super_operations { int (*show_options)(struct seq_file *, struct vfsmount *); int (*show_devname)(struct seq_file *, struct dentry *); - int (*show_path)(struct seq_file *, struct vfsmount *); + int (*show_path)(struct seq_file *, struct dentry *); int (*show_stats)(struct seq_file *, struct dentry *); #ifdef CONFIG_QUOTA ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); |