1 files changed, 14 insertions, 13 deletions

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 8ebd9a334085..2256e7e23e67 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -95,9 +95,9 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
 {
         struct proc_mounts *p = m->private;
         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;
+        int err;
 
         if (sb->s_op->show_devname) {
                 err = sb->s_op->show_devname(m, mnt_path.dentry);
@@ -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)
@@ -191,7 +193,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
         struct mount *r = real_mount(mnt);
         struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
         struct super_block *sb = mnt_path.dentry->d_sb;
-        int err = 0;
+        int err;
 
         /* device */
         if (sb->s_op->show_devname) {
@@ -220,8 +222,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
         /* optional statistics */
         if (sb->s_op->show_stats) {
                 seq_putc(m, ' ');
-                if (!err)
-                        err = sb->s_op->show_stats(m, mnt_path.dentry);
+                err = sb->s_op->show_stats(m, mnt_path.dentry);
         }
 
         seq_putc(m, '\n');