---

yaml --- r: 331586 b: refs/heads/master c: b5e2368 h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · 292d278 · 292d278
1 parent a324111
commit 292d278
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90b0a97323f42ead278bbccbdf0e123db2add400
+refs/heads/master: b5e2368baeddf401bf3da9e364fc1c96676279cd
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
@@ -4656,6 +4656,8 @@ 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_clusters);
 		mb_free_blocks(inode, &e4b, bit, count_clusters);