aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalman Qazi <sqazi@google.com>2012-05-31 23:51:27 -0400
committerBen Hutchings <ben@decadent.org.uk>2012-06-10 14:41:52 +0100
commit40fb8cb8f59ccca96bc4ab10b64ac24cabba4ddb (patch)
tree33c037b49d4cbd7baa2ca92d7b276530ac4154b4
parentf139d067883637c9ab0091fbca821d01d0890123 (diff)
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: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--fs/ext4/mballoc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index e2d8be8f28b..382e4fcb6ce 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4693,6 +4693,7 @@ do_more:
*/
new_entry = kmem_cache_alloc(ext4_free_ext_cachep, GFP_NOFS);
if (!new_entry) {
+ ext4_mb_unload_buddy(&e4b);
err = -ENOMEM;
goto error_return;
}