aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-12-08 21:32:45 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-06 23:16:54 -0500
commitd861c630e99febe5ce6055290085556c5b714b06 (patch)
tree972fb0e89694197dbdbeca13920de08394abfe39 /fs/nfs
parent64132379d509184425672e0dce1ac0a031e3f2a5 (diff)
vfs: switch ->show_devname() to struct dentry *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index dd74d3bc2eaa..6e6faa17bd38 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -263,7 +263,7 @@ static match_table_t nfs_local_lock_tokens = {
263static void nfs_umount_begin(struct super_block *); 263static 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 vfsmount *); 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 vfsmount *);
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 *,
@@ -760,14 +760,14 @@ static void show_pnfs(struct seq_file *m, struct nfs_server *server) {}
760#endif 760#endif
761#endif 761#endif
762 762
763static int nfs_show_devname(struct seq_file *m, struct vfsmount *mnt) 763static int nfs_show_devname(struct seq_file *m, struct dentry *root)
764{ 764{
765 char *page = (char *) __get_free_page(GFP_KERNEL); 765 char *page = (char *) __get_free_page(GFP_KERNEL);
766 char *devname, *dummy; 766 char *devname, *dummy;
767 int err = 0; 767 int err = 0;
768 if (!page) 768 if (!page)
769 return -ENOMEM; 769 return -ENOMEM;
770 devname = nfs_path(&dummy, mnt->mnt_root, page, PAGE_SIZE); 770 devname = nfs_path(&dummy, root, page, PAGE_SIZE);
771 if (IS_ERR(devname)) 771 if (IS_ERR(devname))
772 err = PTR_ERR(devname); 772 err = PTR_ERR(devname);
773 else 773 else