Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6322de6 authored by Al Viro's avatar Al Viro
Browse files

vfs: switch ->show_path() to struct dentry * 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d861c630

fs/nfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/proc_namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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);