---

yaml --- r: 218859 b: refs/heads/master c: 53fdcf9 h: refs/heads/master i: 218857: 67184b5 218855: f9c2cf5 v: v3
git-mirror · Oct 28, 2010 · a4099dd · a4099dd
1 parent 5cffef4
commit a4099dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 582987098207f1182ed5c7d01d5fedf7a5f56286
+refs/heads/master: 53fdcf992d616484d388a8ab9dad07dc8b8f1178
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
@@ -4696,12 +4696,12 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
 		 * with group lock held. generate_buddy look at
 		 * them with group lock_held
 		 */
+		if (test_opt(sb, DISCARD))
+			ext4_issue_discard(sb, block_group, bit, count);
 		ext4_lock_group(sb, block_group);
 		mb_clear_bits(bitmap_bh->b_data, bit, count);
 		mb_free_blocks(inode, &e4b, bit, count);
 		ext4_mb_return_to_preallocation(inode, &e4b, block, count);
-		if (test_opt(sb, DISCARD))
-			ext4_issue_discard(sb, block_group, bit, count);
 	}
 
 	ret = ext4_free_blks_count(sb, gdp) + count;