| From c086b107c572cba6d3600ae292a1e23627756fb0 Mon Sep 17 00:00:00 2001 |
| From: Josef Bacik <josef@redhat.com> |
| Date: Tue, 8 Dec 2009 21:48:58 -0500 |
| Subject: [PATCH 79/85] ext4: wait for log to commit when umounting |
| |
| (cherry picked from commit d4edac314e9ad0b21ba20ba8bc61b61f186f79e1) |
| |
| There is a potential race when a transaction is committing right when |
| the file system is being umounting. This could reduce in a race |
| because EXT4_SB(sb)->s_group_info could be freed in ext4_put_super |
| before the commit code calls a callback so the mballoc code can |
| release freed blocks in the transaction, resulting in a panic trying |
| to access the freed s_group_info. |
| |
| The fix is to wait for the transaction to finish committing before we |
| shutdown the multiblock allocator. |
| |
| Signed-off-by: Josef Bacik <josef@redhat.com> |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/ext4/super.c | 10 ++++++---- |
| 1 file changed, 6 insertions(+), 4 deletions(-) |
| |
| --- a/fs/ext4/super.c |
| +++ b/fs/ext4/super.c |
| @@ -610,10 +610,6 @@ static void ext4_put_super(struct super_ |
| if (sb->s_dirt) |
| ext4_commit_super(sb, 1); |
| |
| - ext4_release_system_zone(sb); |
| - ext4_mb_release(sb); |
| - ext4_ext_release(sb); |
| - ext4_xattr_put_super(sb); |
| if (sbi->s_journal) { |
| err = jbd2_journal_destroy(sbi->s_journal); |
| sbi->s_journal = NULL; |
| @@ -621,6 +617,12 @@ static void ext4_put_super(struct super_ |
| ext4_abort(sb, __func__, |
| "Couldn't clean up the journal"); |
| } |
| + |
| + ext4_release_system_zone(sb); |
| + ext4_mb_release(sb); |
| + ext4_ext_release(sb); |
| + ext4_xattr_put_super(sb); |
| + |
| if (!(sb->s_flags & MS_RDONLY)) { |
| EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER); |
| es->s_state = cpu_to_le16(sbi->s_mount_state); |
