ocfs2: rewrite error handling of ocfs2_fill_super

[ Upstream commit 5822b9147951712c8b776b26bbb84888ca19acce ]

Current ocfs2_fill_super() uses one goto label "read_super_error" to
handle all error cases.  And with previous serial patches, the error
handling should fork more branches to handle different error cases.  This
patch rewrite the error handling of ocfs2_fill_super.

Link: https://lkml.kernel.org/r/20220424130952.2436-6-heming.zhao@suse.com
Signed-off-by: Heming Zhao <heming.zhao@suse.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jun Piao <piaojun@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: ef0adae72907 ("ocfs2: fix memory leak in ocfs2_mount_volume()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index ead43f95bb4327ca6af04ef0683fa7fdc18c96a9..38e51868c2d33197ea29fe2f2065ad192ee7acd9 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -984,28 +984,27 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 
        if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) {
                status = -EINVAL;
-               goto read_super_error;
+               goto out;
        }
 
        /* probe for superblock */
        status = ocfs2_sb_probe(sb, &bh, &sector_size, &stats);
        if (status < 0) {
                mlog(ML_ERROR, "superblock probe failed!\n");
-               goto read_super_error;
+               goto out;
        }
 
        status = ocfs2_initialize_super(sb, bh, sector_size, &stats);
-       osb = OCFS2_SB(sb);
-       if (status < 0) {
-               mlog_errno(status);
-               goto read_super_error;
-       }
        brelse(bh);
        bh = NULL;
+       if (status < 0)
+               goto out;
+
+       osb = OCFS2_SB(sb);
 
        if (!ocfs2_check_set_options(sb, &parsed_options)) {
                status = -EINVAL;
-               goto read_super_error;
+               goto out_super;
        }
        osb->s_mount_opt = parsed_options.mount_opt;
        osb->s_atime_quantum = parsed_options.atime_quantum;
@@ -1022,7 +1021,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 
        status = ocfs2_verify_userspace_stack(osb, &parsed_options);
        if (status)
-               goto read_super_error;
+               goto out_super;
 
        sb->s_magic = OCFS2_SUPER_MAGIC;
 
@@ -1036,7 +1035,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
                        status = -EACCES;
                        mlog(ML_ERROR, "Readonly device detected but readonly "
                             "mount was not specified.\n");
-                       goto read_super_error;
+                       goto out_super;
                }
 
                /* You should not be able to start a local heartbeat
@@ -1045,7 +1044,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
                        status = -EROFS;
                        mlog(ML_ERROR, "Local heartbeat specified on readonly "
                             "device.\n");
-                       goto read_super_error;
+                       goto out_super;
                }
 
                status = ocfs2_check_journals_nolocks(osb);
@@ -1054,9 +1053,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
                                mlog(ML_ERROR, "Recovery required on readonly "
                                     "file system, but write access is "
                                     "unavailable.\n");
-                       else
-                               mlog_errno(status);
-                       goto read_super_error;
+                       goto out_super;
                }
 
                ocfs2_set_ro_flag(osb, 1);
@@ -1072,10 +1069,8 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
        }
 
        status = ocfs2_verify_heartbeat(osb);
-       if (status < 0) {
-               mlog_errno(status);
-               goto read_super_error;
-       }
+       if (status < 0)
+               goto out_super;
 
        osb->osb_debug_root = debugfs_create_dir(osb->uuid_str,
                                                 ocfs2_debugfs_root);
@@ -1089,15 +1084,14 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 
        status = ocfs2_mount_volume(sb);
        if (status < 0)
-               goto read_super_error;
+               goto out_debugfs;
 
        if (osb->root_inode)
                inode = igrab(osb->root_inode);
 
        if (!inode) {
                status = -EIO;
-               mlog_errno(status);
-               goto read_super_error;
+               goto out_dismount;
        }
 
        osb->osb_dev_kset = kset_create_and_add(sb->s_id, NULL,
@@ -1105,7 +1099,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
        if (!osb->osb_dev_kset) {
                status = -ENOMEM;
                mlog(ML_ERROR, "Unable to create device kset %s.\n", sb->s_id);
-               goto read_super_error;
+               goto out_dismount;
        }
 
        /* Create filecheck sysfs related directories/files at
@@ -1114,14 +1108,13 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
                status = -ENOMEM;
                mlog(ML_ERROR, "Unable to create filecheck sysfs directory at "
                        "/sys/fs/ocfs2/%s/filecheck.\n", sb->s_id);
-               goto read_super_error;
+               goto out_dismount;
        }
 
        root = d_make_root(inode);
        if (!root) {
                status = -ENOMEM;
-               mlog_errno(status);
-               goto read_super_error;
+               goto out_dismount;
        }
 
        sb->s_root = root;
@@ -1168,17 +1161,21 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 
        return status;
 
-read_super_error:
-       brelse(bh);
-
-       if (status)
-               mlog_errno(status);
+out_dismount:
+       atomic_set(&osb->vol_state, VOLUME_DISABLED);
+       wake_up(&osb->osb_mount_event);
+       ocfs2_dismount_volume(sb, 1);
+       goto out;
 
-       if (osb) {
-               atomic_set(&osb->vol_state, VOLUME_DISABLED);
-               wake_up(&osb->osb_mount_event);
-               ocfs2_dismount_volume(sb, 1);
-       }
+out_debugfs:
+       debugfs_remove_recursive(osb->osb_debug_root);
+out_super:
+       ocfs2_release_system_inodes(osb);
+       kfree(osb->recovery_map);
+       ocfs2_delete_osb(osb);
+       kfree(osb);
+out:
+       mlog_errno(status);
 
        return status;
 }