hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ext4: always set then trimmed blocks count into len 

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 properly.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Lukas Czerner 2012-03-21 21:26:22 -04:00 committed by Theodore Ts'o
parent 21e7fd22a5
commit a7967f055a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext4/mballoc.c
View File

@ -5035,11 +5035,11 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
*/ */
first_cluster = 0; first_cluster = 0;
} }
range->len = trimmed * sb->s_blocksize;
if (!ret) if (!ret)
atomic_set(&EXT4_SB(sb)->s_last_trim_minblks, minlen); atomic_set(&EXT4_SB(sb)->s_last_trim_minblks, minlen);
out: out:
range->len = trimmed * sb->s_blocksize;
return ret; return ret;
} }