From e1116b40d3164788a6bd903839d6a3d113f8d925 Mon Sep 17 00:00:00 2001
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Date: Thu, 7 Feb 2013 22:57:53 +0800
Subject: [PATCH] --- yaml --- r: 359025 b: refs/heads/master c:
 8e3dffc651cb668e1ff4d8b89cc1c3dde7540d3b h: refs/heads/master i:   359023:
 095574547865cf04e83196e2a4455c6eafb60b21 v: v3

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

diff --git a/[refs] b/[refs]
index 220c523d5c4f..a6574f6f5724 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98783e453c1084527388ec1a7f6367cd6aabbe63
+refs/heads/master: 8e3dffc651cb668e1ff4d8b89cc1c3dde7540d3b
diff --git a/trunk/fs/ext2/balloc.c b/trunk/fs/ext2/balloc.c
index ea88181932df..132da4c0692f 100644
--- a/trunk/fs/ext2/balloc.c
+++ b/trunk/fs/ext2/balloc.c
@@ -568,8 +568,11 @@ void ext2_free_blocks (struct inode * inode, unsigned long block,
 	}
 error_return:
 	brelse(bitmap_bh);
-	release_blocks(sb, freed);
-	dquot_free_block_nodirty(inode, freed);
+	if (freed) {
+		release_blocks(sb, freed);
+		dquot_free_block_nodirty(inode, freed);
+		mark_inode_dirty(inode);
+	}
 }
 
 /**
@@ -1412,9 +1415,11 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal,
 
 	*errp = 0;
 	brelse(bitmap_bh);
-	dquot_free_block_nodirty(inode, *count-num);
-	mark_inode_dirty(inode);
-	*count = num;
+	if (num < *count) {
+		dquot_free_block_nodirty(inode, *count-num);
+		mark_inode_dirty(inode);
+		*count = num;
+	}
 	return ret_block;
 
 io_error: