ocfs2: ocfs2_mount_volume does cleanup job before return error

After this patch, when error, ocfs2_fill_super doesn't take care to
release resources which are allocated in ocfs2_mount_volume.

Link: https://lkml.kernel.org/r/20220424130952.2436-5-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>

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 758ea33..1cf18ed 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1803,11 +1803,10 @@ static int ocfs2_get_sector(struct super_block *sb,
 static int ocfs2_mount_volume(struct super_block *sb)
 {
        int status = 0;
-       int unlock_super = 0;
        struct ocfs2_super *osb = OCFS2_SB(sb);
 
        if (ocfs2_is_hard_readonly(osb))
-               goto leave;
+               goto out;
 
        mutex_init(&osb->obs_trim_fs_mutex);
 
@@ -1817,44 +1816,56 @@ static int ocfs2_mount_volume(struct super_block *sb)
                if (status == -EBADR && ocfs2_userspace_stack(osb))
                        mlog(ML_ERROR, "couldn't mount because cluster name on"
                        " disk does not match the running cluster name.\n");
-               goto leave;
+               goto out;
        }
 
        status = ocfs2_super_lock(osb, 1);
        if (status < 0) {
                mlog_errno(status);
-               goto leave;
+               goto out_dlm;
        }
-       unlock_super = 1;
 
        /* This will load up the node map and add ourselves to it. */
        status = ocfs2_find_slot(osb);
        if (status < 0) {
                mlog_errno(status);
-               goto leave;
+               goto out_super_lock;
        }
 
        /* load all node-local system inodes */
        status = ocfs2_init_local_system_inodes(osb);
        if (status < 0) {
                mlog_errno(status);
-               goto leave;
+               goto out_super_lock;
        }
 
        status = ocfs2_check_volume(osb);
        if (status < 0) {
                mlog_errno(status);
-               goto leave;
+               goto out_system_inodes;
        }
 
        status = ocfs2_truncate_log_init(osb);
-       if (status < 0)
+       if (status < 0) {
                mlog_errno(status);
+               goto out_system_inodes;
+       }
 
-leave:
-       if (unlock_super)
-               ocfs2_super_unlock(osb, 1);
+       ocfs2_super_unlock(osb, 1);
+       return 0;
 
+out_system_inodes:
+       if (osb->local_alloc_state == OCFS2_LA_ENABLED)
+               ocfs2_shutdown_local_alloc(osb);
+       ocfs2_release_system_inodes(osb);
+       /* before journal shutdown, we should release slot_info */
+       ocfs2_free_slot_info(osb);
+       ocfs2_journal_shutdown(osb);
+out_super_lock:
+       ocfs2_super_unlock(osb, 1);
+out_dlm:
+       ocfs2_dlm_shutdown(osb, 0);
+out:
        return status;
 }