diff options
Diffstat (limited to 'fs/ext2/super.c')
-rw-r--r-- | fs/ext2/super.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 647cd888ac87..da8bdeaa2e6d 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -132,6 +132,7 @@ static void ext2_put_super (struct super_block * sb) | |||
132 | percpu_counter_destroy(&sbi->s_dirs_counter); | 132 | percpu_counter_destroy(&sbi->s_dirs_counter); |
133 | brelse (sbi->s_sbh); | 133 | brelse (sbi->s_sbh); |
134 | sb->s_fs_info = NULL; | 134 | sb->s_fs_info = NULL; |
135 | kfree(sbi->s_blockgroup_lock); | ||
135 | kfree(sbi); | 136 | kfree(sbi); |
136 | 137 | ||
137 | return; | 138 | return; |
@@ -756,6 +757,13 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) | |||
756 | sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); | 757 | sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); |
757 | if (!sbi) | 758 | if (!sbi) |
758 | return -ENOMEM; | 759 | return -ENOMEM; |
760 | |||
761 | sbi->s_blockgroup_lock = | ||
762 | kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL); | ||
763 | if (!sbi->s_blockgroup_lock) { | ||
764 | kfree(sbi); | ||
765 | return -ENOMEM; | ||
766 | } | ||
759 | sb->s_fs_info = sbi; | 767 | sb->s_fs_info = sbi; |
760 | sbi->s_sb_block = sb_block; | 768 | sbi->s_sb_block = sb_block; |
761 | 769 | ||
@@ -983,7 +991,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) | |||
983 | printk ("EXT2-fs: not enough memory\n"); | 991 | printk ("EXT2-fs: not enough memory\n"); |
984 | goto failed_mount; | 992 | goto failed_mount; |
985 | } | 993 | } |
986 | bgl_lock_init(&sbi->s_blockgroup_lock); | 994 | bgl_lock_init(sbi->s_blockgroup_lock); |
987 | sbi->s_debts = kcalloc(sbi->s_groups_count, sizeof(*sbi->s_debts), GFP_KERNEL); | 995 | sbi->s_debts = kcalloc(sbi->s_groups_count, sizeof(*sbi->s_debts), GFP_KERNEL); |
988 | if (!sbi->s_debts) { | 996 | if (!sbi->s_debts) { |
989 | printk ("EXT2-fs: not enough memory\n"); | 997 | printk ("EXT2-fs: not enough memory\n"); |