From patchwork Thu Mar 1 10:16:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/5] ext4: Fix trimmed block count computing Date: Thu, 01 Mar 2012 00:16:42 -0000 From: Lukas Czerner X-Patchwork-Id: 143982 Message-Id: <1330597005-751-2-git-send-email-lczerner@redhat.com> To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, Lukas Czerner Currently then if there is not enough free block in the block group to discard (grp->bb_free >= minlen) the 'trimmed' is bumped up anyway with the number of discarded blocks from the previous block group. Fix this by bumping up 'trimmed' only if the ext4_trim_all_free() was actually run. Signed-off-by: Lukas Czerner --- fs/ext4/mballoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 5798cf3..e907cf9 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5083,8 +5083,8 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) ret = cnt; break; } + trimmed += cnt; } - trimmed += cnt; /* * For every group except the first one, we are sure