vfs: show_mountinfo: cleanup error code checks

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>

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 1d984b5e489e152743dd1cad19772db826e5fccd..93637588edf7d3b48e985d9fe90ae5dc35801fab 100644 (file)
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -131,16 +131,17 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
        struct mount *r = real_mount(mnt);
        struct super_block *sb = mnt->mnt_sb;
        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,
                   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);
-       else
+               if (err)
+                       goto out;
+       } else {
                seq_dentry(m, mnt->mnt_root, " \t\n\\");
-       if (err)
-               goto out;
+       }
        seq_putc(m, ' ');
 
        /* 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, " - ");
        show_type(m, sb);
        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);
-       else
+               if (err)
+                       goto out;
+       } else {
                mangle(m, r->mnt_devname ? r->mnt_devname : "none");
-       if (err)
-               goto out;
+       }
        seq_puts(m, sb->s_flags & MS_RDONLY ? " ro" : " rw");
        err = show_sb_opts(m, sb);
        if (err)