Home » Mailing list archives » linux-kernel » 2008 » July » 5

[PATCH 16/52] ext4: remove quota allocation when ext4_mb_new_blocks fails

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Theodore Ts'o <tytso@...>
To: Ext4 Developers List <linux-ext4@...>, Linux Kernel Developers List <linux-kernel@...>
Cc: Shen Feng <shen@...>, Mingming Cao <cmm@...>, Theodore Ts'o <tytso@...>
Subject: [PATCH 16/52] ext4: remove quota allocation when ext4_mb_new_blocks fails
Date: Saturday, July 5, 2008 - 1:35 pm

From: Shen Feng <shen@cn.fujitsu.com>

Quota allocation is not removed when ext4_mb_new_blocks calls
kmem_cache_alloc failed.  Also make sure the allocation context is freed
on the error path.

Signed-off-by: Shen Feng <shen@cn.fujitsu.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 fs/ext4/mballoc.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 11acfe5..8b67414 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4052,8 +4052,9 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
 
 	ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS);
 	if (!ac) {
+		ar->len = 0;
 		*errp = -ENOMEM;
-		return 0;
+		goto out1;
 	}
 
 	ext4_mb_poll_new_transaction(sb, handle);
@@ -4061,7 +4062,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
 	*errp = ext4_mb_initialize_context(ac, ar);
 	if (*errp) {
 		ar->len = 0;
-		goto out;
+		goto out2;
 	}
 
 	ac->ac_op = EXT4_MB_HISTORY_PREALLOC;
@@ -4109,11 +4110,12 @@ repeat:
 
 	ext4_mb_release_context(ac);
 
-out:
+out2:
+	kmem_cache_free(ext4_ac_cachep, ac);
+out1:
 	if (ar->len < inquota)
 		DQUOT_FREE_BLOCK(ar->inode, inquota - ar->len);
 
-	kmem_cache_free(ext4_ac_cachep, ac);
 	return block;
 }
 static void ext4_mb_poll_new_transaction(struct super_block *sb,
-- 
1.5.6.rc3.1.g36b7.dirty

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 08/52] ext4: miscellaneous error checks and coding cl..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 09/52] ext4: remove double definitions of xattr macros, Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 10/52] ext4: Rename read_block_bitmap() to ext4_read_..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 11/52] ext4: Remove unused variable from ext4_show_op..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 12/52] jbd2: Add commit time into the commit block, Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 13/52] ext4: New inode allocation for FLEX_BG meta-da..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 14/52] jbd2: fix race between jbd2_journal_try_to_fre..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 15/52] ext4: remove redundant code in ext4_fill_super(), Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 16/52] ext4: remove quota allocation when ext4_mb_new..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 17/52] ext4: Update i_disksize properly when allocati..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 18/52] ext4: return error when calling ext4_ext_split..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)
[PATCH 19/52] ext4: Make ext4_ext_find_extent fills ext_path..., Theodore Ts'o, (Sat Jul 5, 1:35 pm)