diff --git a/[refs] b/[refs] index ebef5b220756..40de58c182dd 100644 --- 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 index 2102c20f7e98..2c7c082b8169 100644 --- 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);