From: Kari Argillander <kari.argillander@gmail.com>
To: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
ntfs3@lists.linux.dev
Cc: Kari Argillander <kari.argillander@gmail.com>,
linux-kernel@vger.kernel.org,
Christian Brauner <christian.brauner@ubuntu.com>
Subject: [PATCH 04/11] fs/ntfs3: Return straight without goto in fill_super
Date: Thu, 9 Sep 2021 21:09:35 +0300 [thread overview]
Message-ID: <20210909180942.8634-5-kari.argillander@gmail.com> (raw)
In-Reply-To: <20210909180942.8634-1-kari.argillander@gmail.com>
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 <kari.argillander@gmail.com>
---
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
next prev parent reply other threads:[~2021-09-09 18:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 18:09 [PATCH 00/11] fs/ntfs3: Refactor fill_super Kari Argillander
2021-09-09 18:09 ` [PATCH 01/11] fs/ntfs3: Fix wrong error message $Logfile -> $UpCase Kari Argillander
2021-09-09 18:09 ` [PATCH 02/11] fs/ntfs3: Change EINVAL to ENOMEM when d_make_root fails Kari Argillander
2021-09-09 18:09 ` [PATCH 03/11] fs/ntfs3: Remove impossible fault condition in fill_super Kari Argillander
2021-09-09 18:09 ` Kari Argillander [this message]
2021-09-09 18:09 ` [PATCH 05/11] fs/ntfs3: Remove unnecessary variable loading " Kari Argillander
2021-09-09 18:09 ` [PATCH 06/11] fs/ntfs3: Use sb instead of sbi->sb " Kari Argillander
2021-09-09 18:09 ` [PATCH 07/11] fs/ntfs3: Remove tmp var is_ro in ntfs_fill_super Kari Argillander
2021-09-09 18:09 ` [PATCH 08/11] fs/ntfs3: Remove tmp pointer bd_inode in fill_super Kari Argillander
2021-09-09 18:09 ` [PATCH 09/11] fs/ntfs3: Remove tmp pointer upcase " Kari Argillander
2021-09-09 18:09 ` [PATCH 10/11] fs/ntfs3: Initialize pointer before use place " Kari Argillander
2021-09-09 18:09 ` [PATCH 11/11] fs/ntfs3: Initiliaze sb blocksize only in one place + refactor Kari Argillander
2021-09-20 16:07 ` [PATCH 00/11] fs/ntfs3: Refactor fill_super Konstantin Komarov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210909180942.8634-5-kari.argillander@gmail.com \
--to=kari.argillander@gmail.com \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=christian.brauner@ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox