diff options
| author | Curt Wohlgemuth <curtw@google.com> | 2009-12-09 06:18:25 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-12-09 06:18:25 +0300 |
| commit | b844167edc7fcafda9623955c05e4c1b3c32ebc7 (patch) | |
| tree | 60b204901afb6393ace94bd5c8d39246d0a87383 /fs/ext4/mballoc.c | |
| parent | d4edac314e9ad0b21ba20ba8bc61b61f186f79e1 (diff) | |
| download | linux-b844167edc7fcafda9623955c05e4c1b3c32ebc7.tar.xz | |
ext4: remove blocks from inode prealloc list on failure
This fixes a leak of blocks in an inode prealloc list if device failures
cause ext4_mb_mark_diskspace_used() to fail.
Signed-off-by: Curt Wohlgemuth <curtw@google.com>
Acked-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/mballoc.c')
| -rw-r--r-- | fs/ext4/mballoc.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index ab2dad1dfb7e..19635c341994 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3011,6 +3011,24 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac) } /* + * Called on failure; free up any blocks from the inode PA for this + * context. We don't need this for MB_GROUP_PA because we only change + * pa_free in ext4_mb_release_context(), but on failure, we've already + * zeroed out ac->ac_b_ex.fe_len, so group_pa->pa_free is not changed. + */ +static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac) +{ + struct ext4_prealloc_space *pa = ac->ac_pa; + int len; + + if (pa && pa->pa_type == MB_INODE_PA) { + len = ac->ac_b_ex.fe_len; + pa->pa_free += len; + } + +} + +/* * use blocks preallocated to inode */ static void ext4_mb_use_inode_pa(struct ext4_allocation_context *ac, @@ -4295,6 +4313,7 @@ repeat: ac->ac_status = AC_STATUS_CONTINUE; goto repeat; } else if (*errp) { + ext4_discard_allocated_blocks(ac); ac->ac_b_ex.fe_len = 0; ar->len = 0; ext4_mb_show_ac(ac); |