aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r--fs/ext3/super.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index c22d01467bd1..01c235bc2054 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -439,6 +439,7 @@ static void ext3_put_super (struct super_block * sb)
439 ext3_blkdev_remove(sbi); 439 ext3_blkdev_remove(sbi);
440 } 440 }
441 sb->s_fs_info = NULL; 441 sb->s_fs_info = NULL;
442 kfree(sbi->s_blockgroup_lock);
442 kfree(sbi); 443 kfree(sbi);
443 return; 444 return;
444} 445}
@@ -1546,6 +1547,13 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1546 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); 1547 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
1547 if (!sbi) 1548 if (!sbi)
1548 return -ENOMEM; 1549 return -ENOMEM;
1550
1551 sbi->s_blockgroup_lock =
1552 kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
1553 if (!sbi->s_blockgroup_lock) {
1554 kfree(sbi);
1555 return -ENOMEM;
1556 }
1549 sb->s_fs_info = sbi; 1557 sb->s_fs_info = sbi;
1550 sbi->s_mount_opt = 0; 1558 sbi->s_mount_opt = 0;
1551 sbi->s_resuid = EXT3_DEF_RESUID; 1559 sbi->s_resuid = EXT3_DEF_RESUID;
@@ -1786,7 +1794,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1786 goto failed_mount; 1794 goto failed_mount;
1787 } 1795 }
1788 1796
1789 bgl_lock_init(&sbi->s_blockgroup_lock); 1797 bgl_lock_init(sbi->s_blockgroup_lock);
1790 1798
1791 for (i = 0; i < db_count; i++) { 1799 for (i = 0; i < db_count; i++) {
1792 block = descriptor_loc(sb, logic_sb_block, i); 1800 block = descriptor_loc(sb, logic_sb_block, i);