Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp755401pxb; Thu, 9 Sep 2021 11:12:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4udG0lCg3f0QQvI8Z+s/rtvUxf0JmGIUTxaG96SXYlwk/fPWtSmftujuBri9d4kBi+W8b X-Received: by 2002:a17:906:c342:: with SMTP id ci2mr4808230ejb.122.1631211132913; Thu, 09 Sep 2021 11:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631211132; cv=none; d=google.com; s=arc-20160816; b=DSj5zYOrrO4AkY8vrpZ9tm2tF3YfQoI70Cb/ms9dPgCw2ABLgWReZGrFmrC3lGiAd5 NHSGZK7JguIhl5JzrXZL3HbsZX0vQjyON0F446we5dHQPUaFYevlD425XJAm8IUhs616 Tmcts4Oa6lLeOHWfBNE11y0P6hbykfeWo/vugIYlApQwOyP08ezHGRGvX3Bq4I25F3f/ iDYkMcHOGOfqW8L8UyrPrCY0Un+NtVgV41NZzJ9Pq6pj7718+Lh69ypSo1pFQOkD/Pb5 lcOEBs5OTvWSMCRlOepH6OM00tfAXlyyuKvPZCvNqfsKfqRB1IQBelKjhViOAKppjPNn xtzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XToBbj0RLZIUqA/Q77X2jgrFy5XbrvR0CFc+NLRHUDM=; b=xFHi9dxSsXRG4SHXskZuSojvLLpQ3rSwaMEcORAfvNBGrpqf/V2ha4IzEL8Q9DaOa4 DBntQ4QTZ9md/jt7C6/iZsQlmoBVf6txZfwFKu/0fiCgNFba9TGrwjaVQtAeda0C+GNG /ib8jVGtHClKiEfiL6rSHNZ9sEcmA0zdBs/DHikq2ACqqrhfAa8x5A1vIOmtjGn4kkBL OPZ7l3GpY7jEUMWPhakQU+XK1YDQIAot+6El/JsSa6H0TgAVJJNM/vLJJiFxTZ3KclC4 d8GlGDsspaweXfeSWBDjdq9lHf4/NwPDTrW8qzwxM00ZVW4tVT1ero88E6kmvPr5i6WG 5KCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VGlo+77P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l12si2824235edv.561.2021.09.09.11.11.48; Thu, 09 Sep 2021 11:12:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VGlo+77P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243992AbhIISLW (ORCPT + 99 others); Thu, 9 Sep 2021 14:11:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243542AbhIISLI (ORCPT ); Thu, 9 Sep 2021 14:11:08 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F14B1C061757 for ; Thu, 9 Sep 2021 11:09:58 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id l11so5420547lfe.1 for ; Thu, 09 Sep 2021 11:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XToBbj0RLZIUqA/Q77X2jgrFy5XbrvR0CFc+NLRHUDM=; b=VGlo+77Pp0Rb7Pz2BYqkpTwmELbb0KZ8n+RBPOsdppOcuBh4bRP/W6oIp3NM1QPiOs uWtrPlPhiuEfBAKCcUTmzfIg5cffdM5mow1+Tjpf25p5a6UVEWh9ZLVdxW/h+kvabmKB QHVOf7ZEY8YZHe37MZX4KV5eMW/2dZkJ0UZKoqP4auEJRVCZ/VOrZJ8ZA1WgEFoO+Liz +cPQBqAKzwOpXIsFeTnjrVNXkbYaPz3yXgjO0yo6P0VSkq0eZ48LKwsyjYc0VB2urwjP jzIIPQbPvzofdXyt+/9WKVl4C3zahd3YEGzj5Lw0+BaFVLGK/+mf4NzXleGhYMF+FE5y iC9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XToBbj0RLZIUqA/Q77X2jgrFy5XbrvR0CFc+NLRHUDM=; b=nriSDVgxG+a8AIr2AZmiOfCAkllHcVNPDJzYhhZTt5/kI3Pu0GzaXoPHE0MyHcgVrg 8zyuRWTHQl1HBGHgCqiVK7x+h4dUv7ZtHOUlQ2bKcHRekfdPV5tUalBMMRNbnRWWFPya Mfk0KjSdjm612OZf659T4kVOYrKM5FVcjAlZYu42L12UaaChZMT24QwtVARJpsXuh6Ic sP4EeQ5PvCMX32l0wO4Y5cQnOiMBFWXYDFxkvAxOZsQu43t0s331gd0D212MCzMahRPm UPjj4qotQDf6nNq1MWLWvfPdZcFfK7wUHmjtCU97nMr/QbCPsVDz2qlNSkzTXIj6Qo+8 eK/Q== X-Gm-Message-State: AOAM531ZNBIhRoB5nBlQ1tXE8Keb7zU0DOnlJhFG33nR6o/ITGiYbj0F dIHLi0VcG+CSYrllh0Ii6Uc= X-Received: by 2002:a19:700c:: with SMTP id h12mr847185lfc.672.1631210997353; Thu, 09 Sep 2021 11:09:57 -0700 (PDT) Received: from kari-VirtualBox.telewell.oy (85-23-89-224.bb.dnainternet.fi. [85.23.89.224]) by smtp.gmail.com with ESMTPSA id u2sm270276lff.238.2021.09.09.11.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 11:09:57 -0700 (PDT) From: Kari Argillander To: Konstantin Komarov , ntfs3@lists.linux.dev Cc: Kari Argillander , linux-kernel@vger.kernel.org, Christian Brauner Subject: [PATCH 04/11] fs/ntfs3: Return straight without goto in fill_super Date: Thu, 9 Sep 2021 21:09:35 +0300 Message-Id: <20210909180942.8634-5-kari.argillander@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210909180942.8634-1-kari.argillander@gmail.com> References: <20210909180942.8634-1-kari.argillander@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In many places it is not needed to use goto out. We can just return right away. This will make code little bit more cleaner as we won't need to check error path. Signed-off-by: Kari Argillander --- fs/ntfs3/super.c | 56 ++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index 793c064833c2..f3c3c2bea6ca 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -923,7 +923,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) err = ntfs_init_from_boot(sb, rq ? queue_logical_block_size(rq) : 512, bd_inode->i_size); if (err) - goto out; + return err; #ifdef CONFIG_NTFS3_64BIT_CLUSTER sb->s_maxbytes = MAX_LFS_FILESIZE; @@ -939,10 +939,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) ref.seq = cpu_to_le16(MFT_REC_VOL); inode = ntfs_iget5(sb, &ref, &NAME_VOLUME); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load $Volume."); - inode = NULL; - goto out; + return PTR_ERR(inode); } ni = ntfs_i(inode); @@ -990,10 +988,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) ref.seq = cpu_to_le16(MFT_REC_MIRR); inode = ntfs_iget5(sb, &ref, &NAME_MIRROR); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load $MFTMirr."); - inode = NULL; - goto out; + return PTR_ERR(inode); } sbi->mft.recs_mirr = @@ -1006,10 +1002,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) ref.seq = cpu_to_le16(MFT_REC_LOG); inode = ntfs_iget5(sb, &ref, &NAME_LOGFILE); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load \x24LogFile."); - inode = NULL; - goto out; + return PTR_ERR(inode); } ni = ntfs_i(inode); @@ -1027,16 +1021,14 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) if (!is_ro) { ntfs_warn(sb, "failed to replay log file. Can't mount rw!"); - err = -EINVAL; - goto out; + return -EINVAL; } } else if (sbi->volume.flags & VOLUME_FLAG_DIRTY) { if (!is_ro && !sbi->options->force) { ntfs_warn( sb, "volume is dirty and \"force\" flag is not set!"); - err = -EINVAL; - goto out; + return -EINVAL; } } @@ -1046,10 +1038,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) inode = ntfs_iget5(sb, &ref, &NAME_MFT); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load $MFT."); - inode = NULL; - goto out; + return PTR_ERR(inode); } ni = ntfs_i(inode); @@ -1073,10 +1063,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) ref.seq = cpu_to_le16(MFT_REC_BADCLUST); inode = ntfs_iget5(sb, &ref, &NAME_BADCLUS); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load $BadClus."); - inode = NULL; - goto out; + return PTR_ERR(inode); } ni = ntfs_i(inode); @@ -1098,10 +1086,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) ref.seq = cpu_to_le16(MFT_REC_BITMAP); inode = ntfs_iget5(sb, &ref, &NAME_BITMAP); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load $Bitmap."); - inode = NULL; - goto out; + return PTR_ERR(inode); } ni = ntfs_i(inode); @@ -1131,17 +1117,15 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) /* Compute the MFT zone. */ err = ntfs_refresh_zone(sbi); if (err) - goto out; + return err; /* Load $AttrDef. */ ref.low = cpu_to_le32(MFT_REC_ATTR); ref.seq = cpu_to_le16(MFT_REC_ATTR); inode = ntfs_iget5(sbi->sb, &ref, &NAME_ATTRDEF); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load $AttrDef -> %d", err); - inode = NULL; - goto out; + return PTR_ERR(inode); } if (inode->i_size < sizeof(struct ATTR_DEF_ENTRY)) { @@ -1202,10 +1186,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) ref.seq = cpu_to_le16(MFT_REC_UPCASE); inode = ntfs_iget5(sb, &ref, &NAME_UPCASE); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load $UpCase."); - inode = NULL; - goto out; + return PTR_ERR(inode); } ni = ntfs_i(inode); @@ -1251,7 +1233,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) /* Load $Secure. */ err = ntfs_security_init(sbi); if (err) - goto out; + return err; /* Load $Extend. */ err = ntfs_extend_init(sbi); @@ -1275,26 +1257,20 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) ref.seq = cpu_to_le16(MFT_REC_ROOT); inode = ntfs_iget5(sb, &ref, &NAME_ROOT); if (IS_ERR(inode)) { - err = PTR_ERR(inode); ntfs_err(sb, "Failed to load root."); - inode = NULL; - goto out; + return PTR_ERR(inode); } ni = ntfs_i(inode); sb->s_root = d_make_root(inode); - - if (!sb->s_root) { - err = -ENOMEM; - goto out; - } + if (!sb->s_root) + return -ENOMEM; fc->fs_private = NULL; fc->s_fs_info = NULL; return 0; - out: iput(inode); return err; -- 2.25.1