[4/5] ext4: Always set then trimmed blocks count into len

Submitted by Lukas Czerner on March 1, 2012, 10:16 a.m.


Message ID 1330597005-751-4-git-send-email-lczerner@redhat.com
State Superseded, archived
Delegated to: Theodore Ts'o
Headers show

Commit Message

Lukas Czerner March 1, 2012, 10:16 a.m.
Currently if the range to trim is too small, for example on 1K fs
the request to trim the first block, then the 'range->len' is not set
reporting wrong number of discarded block to the caller.

Fix this by always setting the 'range->len' before we return. Note that
when there is a failure (-EINVAL) caller can not depend on 'range->len'
being set.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
 fs/ext4/mballoc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index f20688e..8f817f2 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -5092,11 +5092,11 @@  int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
 		first_cluster = 0;
-	range->len = trimmed * sb->s_blocksize;
 	if (!ret)
 		atomic_set(&EXT4_SB(sb)->s_last_trim_minblks, minlen);
+	range->len = trimmed * sb->s_blocksize;
 	return ret;