Fix ext4 corrupted bitmap error path (pointed out by Eric Sandeen)

This commit is contained in:
Josh Boyer 2012-01-10 14:08:28 -05:00
parent dba7dc5d3e
commit 5e42663853
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,19 @@
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 00beb4f..8fb6844 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -885,8 +885,12 @@ got:
if (IS_DIRSYNC(inode))
ext4_handle_sync(handle);
if (insert_inode_locked(inode) < 0) {
- err = -EINVAL;
- goto fail_drop;
+ /*
+ * Likely a bitmap corruption causing inode to be allocated
+ * twice.
+ */
+ err = -EIO;
+ goto fail;
}
spin_lock(&sbi->s_next_gen_lock);
inode->i_generation = sbi->s_next_generation++;

View File

@ -731,6 +731,8 @@ Patch21056: KVM-fix-device-assignment-permissions.patch
#rhbz 770233
Patch21065: Bluetooth-Add-support-for-BCM20702A0.patch
Patch21071: ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@ -1356,6 +1358,8 @@ ApplyPatch Bluetooth-Add-support-for-BCM20702A0.patch
#rhbz 770096
ApplyPatch KVM-fix-device-assignment-permissions.patch
ApplyPatch ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
# END OF PATCH APPLICATIONS
%endif
@ -2003,6 +2007,9 @@ fi
# and build.
%changelog
* Tue Jan 10 2012 Josh Boyer <jwboyer@redhat.com>
- Fix ext4 corrupted bitmap error path (pointed out by Eric Sandeen)
* Fri Jan 06 2012 Josh Boyer <jwboyer@redhat.com> 2.6.41.8-1
- Linux 3.1.8