On 22/09/03 11:01AM, Jason Yan wrote:
> Before these two branches neither loaded the journal nor created the
> xattr cache. So the right label to goto is 'failed_mount3a'. Although
> this did not cause any issues because the error handler validated if the
> pointer is null. However this still made me confused when reading
> the code. So it's still worth to modify to goto the right label.
>
> Signed-off-by: Jason Yan <[email protected]>
> Reviewed-by: Jan Kara <[email protected]>
> ---
> fs/ext4/super.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
This looks good to me.
Reviewed-by: Ritesh Harjani (IBM) <[email protected]>
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 9a66abcca1a8..6126da867b26 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -5079,30 +5079,30 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
> ext4_has_feature_journal_needs_recovery(sb)) {
> ext4_msg(sb, KERN_ERR, "required journal recovery "
> "suppressed and not mounted read-only");
> - goto failed_mount_wq;
> + goto failed_mount3a;
> } else {
> /* Nojournal mode, all journal mount options are illegal */
> if (test_opt2(sb, EXPLICIT_JOURNAL_CHECKSUM)) {
> ext4_msg(sb, KERN_ERR, "can't mount with "
> "journal_checksum, fs mounted w/o journal");
> - goto failed_mount_wq;
> + goto failed_mount3a;
> }
> if (test_opt(sb, JOURNAL_ASYNC_COMMIT)) {
> ext4_msg(sb, KERN_ERR, "can't mount with "
> "journal_async_commit, fs mounted w/o journal");
> - goto failed_mount_wq;
> + goto failed_mount3a;
> }
> if (sbi->s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ) {
> ext4_msg(sb, KERN_ERR, "can't mount with "
> "commit=%lu, fs mounted w/o journal",
> sbi->s_commit_interval / HZ);
> - goto failed_mount_wq;
> + goto failed_mount3a;
> }
> if (EXT4_MOUNT_DATA_FLAGS &
> (sbi->s_mount_opt ^ sbi->s_def_mount_opt)) {
> ext4_msg(sb, KERN_ERR, "can't mount with "
> "data=, fs mounted w/o journal");
> - goto failed_mount_wq;
> + goto failed_mount3a;
> }
> sbi->s_def_mount_opt &= ~EXT4_MOUNT_JOURNAL_CHECKSUM;
> clear_opt(sb, JOURNAL_CHECKSUM);
> --
> 2.31.1
>