f2fs: fix trim_fs assignment

This is missing fix from upstream.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Jaegeuk Kim
2017-02-23 16:58:09 -08:00
parent 5e95180bf6
commit 0166e6469f

View File

@@ -1675,14 +1675,19 @@ static const struct segment_allocation default_salloc_ops = {
bool exist_trim_candidates(struct f2fs_sb_info *sbi, struct cp_control *cpc)
{
__u64 trim_start = cpc->trim_start;
bool has_candidate = false;
mutex_lock(&SIT_I(sbi)->sentry_lock);
for (; trim_start <= cpc->trim_end; trim_start++)
if (add_discard_addrs(sbi, cpc, true))
for (; cpc->trim_start <= cpc->trim_end; cpc->trim_start++) {
if (add_discard_addrs(sbi, cpc, true)) {
has_candidate = true;
break;
}
}
mutex_unlock(&SIT_I(sbi)->sentry_lock);
return trim_start <= cpc->trim_end;
cpc->trim_start = trim_start;
return has_candidate;
}
int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range)