From a4099dd692ccf22e165e54d2a906fc3a39b93834 Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Wed, 27 Oct 2010 21:30:04 -0400 Subject: [PATCH] --- yaml --- r: 218859 b: refs/heads/master c: 53fdcf992d616484d388a8ab9dad07dc8b8f1178 h: refs/heads/master i: 218857: 67184b597bc917bd667d4a6403f8b14e08a71b14 218855: f9c2cf562fa6b096f621868885109e4699dcc467 v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 372450c917ef..cb5bd990ebc9 100644 --- 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 index 53472e27b327..ccdfec6acb75 100644 --- 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;