leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: show_mountinfo: cleanup error code checks

Browse Source 
Check err variable right after each assignment.  This change makes
initialization of err redundant, so remove the initialization.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Dmitry V. Levin 2015-11-19 00:58:20 +03:00 committed by Al Viro
parent 5d9f3c7b62
commit 6ce4bca0ad
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/proc_namespace.c
View File

@ -131,16 +131,17 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
struct mount *r = real_mount(mnt); struct mount *r = real_mount(mnt);
struct super_block *sb = mnt->mnt_sb; struct super_block *sb = mnt->mnt_sb;
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
int err = 0; int err;
seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id, seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev)); MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path) if (sb->s_op->show_path) {
err = sb->s_op->show_path(m, mnt->mnt_root); err = sb->s_op->show_path(m, mnt->mnt_root);
else if (err)
goto out;
} else {
seq_dentry(m, mnt->mnt_root, " \t\n\\"); seq_dentry(m, mnt->mnt_root, " \t\n\\");
if (err) }
goto out;
seq_putc(m, ' '); seq_putc(m, ' ');
/* mountpoints outside of chroot jail will give SEQ_SKIP on this */ /* mountpoints outside of chroot jail will give SEQ_SKIP on this */
@ -168,12 +169,13 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
seq_puts(m, " - "); seq_puts(m, " - ");
show_type(m, sb); show_type(m, sb);
seq_putc(m, ' '); seq_putc(m, ' ');
if (sb->s_op->show_devname) if (sb->s_op->show_devname) {
err = sb->s_op->show_devname(m, mnt->mnt_root); err = sb->s_op->show_devname(m, mnt->mnt_root);
else if (err)
goto out;
} else {
mangle(m, r->mnt_devname ? r->mnt_devname : "none"); mangle(m, r->mnt_devname ? r->mnt_devname : "none");
if (err) }
goto out;
seq_puts(m, sb->s_flags & MS_RDONLY ? " ro" : " rw"); seq_puts(m, sb->s_flags & MS_RDONLY ? " ro" : " rw");
err = show_sb_opts(m, sb); err = show_sb_opts(m, sb);
if (err) if (err)