From e9d401e09608faaecd4c627770afdaf2f436f244 Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Mon, 28 May 2012 17:53:53 -0400 Subject: [PATCH] --- yaml --- r: 309962 b: refs/heads/master c: 400db9d30146dc062aaba97a6301b425eb6015bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b6b3eb812db7..877ec0fbb60d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cde417de013b2e5ae3007374d937e8c4c426bd4 +refs/heads/master: 400db9d30146dc062aaba97a6301b425eb6015bc diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index 45cb31e8dd27..e4b4ac1ec684 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -3073,13 +3073,9 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac) 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; - } + if (pa && pa->pa_type == MB_INODE_PA) + pa->pa_free += ac->ac_b_ex.fe_len; } /*