]> git.hungrycats.org Git - linux/commitdiff
ext4: add ext4_mb_unload_buddy in the error path
authorSalman Qazi <sqazi@google.com>
Fri, 1 Jun 2012 03:51:27 +0000 (23:51 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Jun 2012 15:36:16 +0000 (00:36 +0900)
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>
fs/ext4/mballoc.c

index 99ab428bcfa089822e74b433aee7b1bf4076e34d..5c315abc87b3638895523d09ec1df5caa3297730 100644 (file)
@@ -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;
                }