ovl: remove unneeded goto instructions

There is nothing in the out goto target of ovl_get_layers().

Reviewed-by: Alexander Larsson <alexl@redhat.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index dace72ed36c20a4016cb13c6183853d8954e352c..b1124cf852069190838dc8259bb27330a767e9fb 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1575,10 +1575,9 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
        int err;
        unsigned int i;
 
-       err = -ENOMEM;
        ofs->fs = kcalloc(numlower + 1, sizeof(struct ovl_sb), GFP_KERNEL);
        if (ofs->fs == NULL)
-               goto out;
+               return -ENOMEM;
 
        /* idx/fsid 0 are reserved for upper fs even with lower only overlay */
        ofs->numfs++;
@@ -1592,7 +1591,7 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
        err = get_anon_bdev(&ofs->fs[0].pseudo_dev);
        if (err) {
                pr_err("failed to get anonymous bdev for upper fs\n");
-               goto out;
+               return err;
        }
 
        if (ovl_upper_mnt(ofs)) {
@@ -1605,9 +1604,9 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
                struct inode *trap;
                int fsid;
 
-               err = fsid = ovl_get_fsid(ofs, &stack[i]);
-               if (err < 0)
-                       goto out;
+               fsid = ovl_get_fsid(ofs, &stack[i]);
+               if (fsid < 0)
+                       return fsid;
 
                /*
                 * Check if lower root conflicts with this overlay layers before
@@ -1618,13 +1617,13 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
                 */
                err = ovl_setup_trap(sb, stack[i].dentry, &trap, "lowerdir");
                if (err)
-                       goto out;
+                       return err;
 
                if (ovl_is_inuse(stack[i].dentry)) {
                        err = ovl_report_in_use(ofs, "lowerdir");
                        if (err) {
                                iput(trap);
-                               goto out;
+                               return err;
                        }
                }
 
@@ -1633,7 +1632,7 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
                if (IS_ERR(mnt)) {
                        pr_err("failed to clone lowerpath\n");
                        iput(trap);
-                       goto out;
+                       return err;
                }
 
                /*
@@ -1683,9 +1682,7 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
                        ofs->xino_mode);
        }
 
-       err = 0;
-out:
-       return err;
+       return 0;
 }
 
 static struct ovl_entry *ovl_get_lowerstack(struct super_block *sb,