Commit 31a055ab authored by Dmitry V. Levin's avatar Dmitry V. Levin Committed by Ben Hutchings

vfs: show_vfsstat: do not ignore errors from show_devname method

commit 5f8d498d upstream.

Explicitly check show_devname method return code and bail out in case
of an error.  This fixes regression introduced by commit 9d4d6574.
Signed-off-by: default avatarDmitry V. Levin <ldv@altlinux.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.16: add the 'out' label]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent a34207e9
...@@ -191,6 +191,8 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt) ...@@ -191,6 +191,8 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
if (sb->s_op->show_devname) { if (sb->s_op->show_devname) {
seq_puts(m, "device "); seq_puts(m, "device ");
err = sb->s_op->show_devname(m, mnt_path.dentry); err = sb->s_op->show_devname(m, mnt_path.dentry);
if (err)
goto out;
} else { } else {
if (r->mnt_devname) { if (r->mnt_devname) {
seq_puts(m, "device "); seq_puts(m, "device ");
...@@ -216,6 +218,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt) ...@@ -216,6 +218,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
} }
seq_putc(m, '\n'); seq_putc(m, '\n');
out:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment