diff --git a/[refs] b/[refs] index 04fde2ee2607..7bdbb761cb13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87009d86dc045d228e21242467a67a5f99347553 +refs/heads/master: b56ff9d397cecdaad6c98c9d57cc6fea475e1f50 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index c58eba34724a..5b4d4e3a4d58 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -4640,8 +4640,6 @@ 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);