diff options
| author | Andrey Tsyvarev <tsyvarev@ispras.ru> | 2014-05-12 12:34:21 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-05-12 12:34:21 -0400 |
| commit | 029b10c5a8d9e9db528eea66f5728ccca56c2f27 (patch) | |
| tree | 48af4a9fbc52c0c62a3931eb4aa95dc34ef1e076 | |
| parent | c197855ea14175a25003c276824689e8ba318e53 (diff) | |
| download | blackbird-op-linux-029b10c5a8d9e9db528eea66f5728ccca56c2f27.tar.gz blackbird-op-linux-029b10c5a8d9e9db528eea66f5728ccca56c2f27.zip | |
ext4: do not destroy ext4_groupinfo_caches if ext4_mb_init() fails
Caches from 'ext4_groupinfo_caches' may be in use by other mounts,
which have already existed. So, it is incorrect to destroy them when
newly requested mount fails.
Found by Linux File System Verification project (linuxtesting.org).
Signed-off-by: Andrey Tsyvarev <tsyvarev@ispras.ru>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
| -rw-r--r-- | fs/ext4/mballoc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index c8238a26818c..3235a2fd7e7e 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2617,7 +2617,7 @@ int ext4_mb_init(struct super_block *sb) sbi->s_locality_groups = alloc_percpu(struct ext4_locality_group); if (sbi->s_locality_groups == NULL) { ret = -ENOMEM; - goto out_free_groupinfo_slab; + goto out; } for_each_possible_cpu(i) { struct ext4_locality_group *lg; @@ -2642,8 +2642,6 @@ int ext4_mb_init(struct super_block *sb) out_free_locality_groups: free_percpu(sbi->s_locality_groups); sbi->s_locality_groups = NULL; -out_free_groupinfo_slab: - ext4_groupinfo_destroy_slabs(); out: kfree(sbi->s_mb_offsets); sbi->s_mb_offsets = NULL; |
