diff options
author | Salman Qazi <sqazi@google.com> | 2012-06-01 07:51:27 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-09 19:36:16 +0400 |
commit | d2e926777a97fc29ebfa409584ed4e790f2e68bf (patch) | |
tree | bd452ee3b42c2aa64cca4ffa7ca0b70dbb56336c /fs | |
parent | 5720f8de251bbf23fc9f4191d6ed5734110b7d67 (diff) | |
download | linux-d2e926777a97fc29ebfa409584ed4e790f2e68bf.tar.xz |
ext4: add ext4_mb_unload_buddy in the error path
commit 02b7831019ea4e7994968c84b5826fa8b248ffc8 upstream.
ext4_free_blocks fails to pair an ext4_mb_load_buddy with a matching
ext4_mb_unload_buddy when it fails a memory allocation.
Signed-off-by: Salman Qazi <sqazi@google.com>
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/mballoc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 99ab428bcfa0..5c315abc87b3 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4636,6 +4636,7 @@ do_more: */ new_entry = kmem_cache_alloc(ext4_free_data_cachep, GFP_NOFS); if (!new_entry) { + ext4_mb_unload_buddy(&e4b); err = -ENOMEM; goto error_return; } |