From bce4d32e50b063fa256b6aa2215589a1d9054c84 Mon Sep 17 00:00:00 2001
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Date: Thu, 7 Feb 2013 22:57:54 +0800
Subject: [PATCH] --- yaml --- r: 359026 b: refs/heads/master c:
 712ddc52ffa1f5324cd8f682d9e5b047b91f34d3 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext2/balloc.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index a6574f6f5724..73dd8c88d1d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e3dffc651cb668e1ff4d8b89cc1c3dde7540d3b
+refs/heads/master: 712ddc52ffa1f5324cd8f682d9e5b047b91f34d3
diff --git a/trunk/fs/ext2/balloc.c b/trunk/fs/ext2/balloc.c
index 132da4c0692f..9f9992b37924 100644
--- a/trunk/fs/ext2/balloc.c
+++ b/trunk/fs/ext2/balloc.c
@@ -159,15 +159,6 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
 	return bh;
 }
 
-static void release_blocks(struct super_block *sb, int count)
-{
-	if (count) {
-		struct ext2_sb_info *sbi = EXT2_SB(sb);
-
-		percpu_counter_add(&sbi->s_freeblocks_counter, count);
-	}
-}
-
 static void group_adjust_blocks(struct super_block *sb, int group_no,
 	struct ext2_group_desc *desc, struct buffer_head *bh, int count)
 {
@@ -569,7 +560,7 @@ void ext2_free_blocks (struct inode * inode, unsigned long block,
 error_return:
 	brelse(bitmap_bh);
 	if (freed) {
-		release_blocks(sb, freed);
+		percpu_counter_add(&sbi->s_freeblocks_counter, freed);
 		dquot_free_block_nodirty(inode, freed);
 		mark_inode_dirty(inode);
 	}