diff options
author | Jan Kara <jack@suse.cz> | 2011-12-18 17:37:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-21 12:40:04 -0400 |
commit | 1a28fbbebe6bd7e3f0338663302b3b3ce500e088 (patch) | |
tree | 98279af6779360496ef7a93e6e85f03a25026dbc /fs | |
parent | 8e8a21270cbfc41bf3bf2e014b99dc113ba554ec (diff) |
ext4: fix error handling on inode bitmap corruption
commit acd6ad83517639e8f09a8c5525b1dccd81cd2a10 upstream.
When insert_inode_locked() fails in ext4_new_inode() it most likely means inode
bitmap got corrupted and we allocated again inode which is already in use. Also
doing unlock_new_inode() during error recovery is wrong since the inode does
not have I_NEW set. Fix the problem by jumping to fail: (instead of fail_drop:)
which declares filesystem error and does not call unlock_new_inode().
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/ialloc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 21bb2f61e50..412469b241a 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
@@ -1021,8 +1021,12 @@ got: | |||
1021 | if (IS_DIRSYNC(inode)) | 1021 | if (IS_DIRSYNC(inode)) |
1022 | ext4_handle_sync(handle); | 1022 | ext4_handle_sync(handle); |
1023 | if (insert_inode_locked(inode) < 0) { | 1023 | if (insert_inode_locked(inode) < 0) { |
1024 | err = -EINVAL; | 1024 | /* |
1025 | goto fail_drop; | 1025 | * Likely a bitmap corruption causing inode to be allocated |
1026 | * twice. | ||
1027 | */ | ||
1028 | err = -EIO; | ||
1029 | goto fail; | ||
1026 | } | 1030 | } |
1027 | spin_lock(&sbi->s_next_gen_lock); | 1031 | spin_lock(&sbi->s_next_gen_lock); |
1028 | inode->i_generation = sbi->s_next_generation++; | 1032 | inode->i_generation = sbi->s_next_generation++; |