From: Miklos Szeredi <mszeredi@redhat.com>
Date: Thu, 21 Oct 2021 08:01:39 +0000 (+0200)
Subject: fuse: clean up error exits in fuse_fill_super()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=964d32e512670c7b87870e30cfed2303da86d614;p=linux.git

fuse: clean up error exits in fuse_fill_super()

Instead of "goto err", return error directly, since there's no error
cleanup to do now.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index b468f55634f2d..12d49a1914e84 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1566,22 +1566,18 @@ static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc)
 	 * Require mount to happen from the same user namespace which
 	 * opened /dev/fuse to prevent potential attacks.
 	 */
-	err = -EINVAL;
 	if ((ctx->file->f_op != &fuse_dev_operations) ||
 	    (ctx->file->f_cred->user_ns != sb->s_user_ns))
-		goto err;
+		return -EINVAL;
 	ctx->fudptr = &ctx->file->private_data;
 
 	err = fuse_fill_super_common(sb, ctx);
 	if (err)
-		goto err;
+		return err;
 	/* file->private_data shall be visible on all CPUs after this */
 	smp_mb();
 	fuse_send_init(get_fuse_mount_super(sb));
 	return 0;
-
- err:
-	return err;
 }
 
 /*