lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext4: Free resources in some error path in ext4_fill_super

Browse Source 
Some of the error path in ext4_fill_super don't release the
resouces properly. So this patch just try to release them
in the right way.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Tao Ma
2011-10-06 12:10:11 -04:00
committed by Theodore Ts'o
parent 7aa0baeaba
commit dcf2d804ed
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/ext4/super.c
View File

@@ -3785,22 +3785,19 @@ no_journal:
if (err) { if (err) {
ext4_msg(sb, KERN_ERR, "failed to initialize mballoc (%d)", ext4_msg(sb, KERN_ERR, "failed to initialize mballoc (%d)",
err); err);
goto failed_mount4; goto failed_mount5;
} }
err = ext4_register_li_request(sb, first_not_zeroed); err = ext4_register_li_request(sb, first_not_zeroed);
if (err) if (err)
goto failed_mount4; goto failed_mount6;
sbi->s_kobj.kset = ext4_kset; sbi->s_kobj.kset = ext4_kset;
init_completion(&sbi->s_kobj_unregister); init_completion(&sbi->s_kobj_unregister);
err = kobject_init_and_add(&sbi->s_kobj, &ext4_ktype, NULL, err = kobject_init_and_add(&sbi->s_kobj, &ext4_ktype, NULL,
"%s", sb->s_id); "%s", sb->s_id);
if (err) { if (err)
ext4_mb_release(sb); goto failed_mount7;
ext4_ext_release(sb);
goto failed_mount4;
};
EXT4_SB(sb)->s_mount_state |= EXT4_ORPHAN_FS; EXT4_SB(sb)->s_mount_state |= EXT4_ORPHAN_FS;
ext4_orphan_cleanup(sb, es); ext4_orphan_cleanup(sb, es);
@@ -3834,13 +3831,19 @@ cantfind_ext4:
ext4_msg(sb, KERN_ERR, "VFS: Can't find ext4 filesystem"); ext4_msg(sb, KERN_ERR, "VFS: Can't find ext4 filesystem");
goto failed_mount; goto failed_mount;
failed_mount7:
ext4_unregister_li_request(sb);
failed_mount6:
ext4_ext_release(sb);
failed_mount5:
ext4_mb_release(sb);
ext4_release_system_zone(sb);
failed_mount4: failed_mount4:
iput(root); iput(root);
sb->s_root = NULL; sb->s_root = NULL;
ext4_msg(sb, KERN_ERR, "mount failed"); ext4_msg(sb, KERN_ERR, "mount failed");
destroy_workqueue(EXT4_SB(sb)->dio_unwritten_wq); destroy_workqueue(EXT4_SB(sb)->dio_unwritten_wq);
failed_mount_wq: failed_mount_wq:
ext4_release_system_zone(sb);
if (sbi->s_journal) { if (sbi->s_journal) {
jbd2_journal_destroy(sbi->s_journal); jbd2_journal_destroy(sbi->s_journal);
sbi->s_journal = NULL; sbi->s_journal = NULL;