summaryrefslogtreecommitdiffstats
path: root/fs/proc_namespace.c
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/proc_namespace.c
parent64132379d509184425672e0dce1ac0a031e3f2a5 (diff)
downloadlinux-stable-d861c630e99febe5ce6055290085556c5b714b06.tar.gz
linux-stable-d861c630e99febe5ce6055290085556c5b714b06.tar.bz2
linux-stable-d861c630e99febe5ce6055290085556c5b714b06.zip
vfs: switch ->show_devname() to struct dentry *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc_namespace.c')
-rw-r--r--fs/proc_namespace.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 61a09a6364ba..6d4583ddbeda 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -94,9 +94,10 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
struct mount *r = real_mount(mnt);
int err = 0;
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
+ struct super_block *sb = mnt_path.dentry->d_sb;
- if (mnt->mnt_sb->s_op->show_devname) {
- err = mnt->mnt_sb->s_op->show_devname(m, mnt);
+ if (sb->s_op->show_devname) {
+ err = sb->s_op->show_devname(m, mnt_path.dentry);
if (err)
goto out;
} else {
@@ -105,14 +106,14 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
seq_putc(m, ' ');
seq_path(m, &mnt_path, " \t\n\\");
seq_putc(m, ' ');
- show_type(m, mnt->mnt_sb);
+ show_type(m, sb);
seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
- err = show_sb_opts(m, mnt->mnt_sb);
+ err = show_sb_opts(m, sb);
if (err)
goto out;
show_mnt_opts(m, mnt);
- if (mnt->mnt_sb->s_op->show_options)
- err = mnt->mnt_sb->s_op->show_options(m, mnt);
+ if (sb->s_op->show_options)
+ err = sb->s_op->show_options(m, mnt);
seq_puts(m, " 0 0\n");
out:
return err;
@@ -163,7 +164,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
show_type(m, sb);
seq_putc(m, ' ');
if (sb->s_op->show_devname)
- err = sb->s_op->show_devname(m, mnt);
+ err = sb->s_op->show_devname(m, mnt->mnt_root);
else
mangle(m, r->mnt_devname ? r->mnt_devname : "none");
if (err)
@@ -189,7 +190,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
/* device */
if (sb->s_op->show_devname) {
seq_puts(m, "device ");
- err = sb->s_op->show_devname(m, mnt);
+ err = sb->s_op->show_devname(m, mnt_path.dentry);
} else {
if (r->mnt_devname) {
seq_puts(m, "device ");