diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-06-02 15:48:20 -0700 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-06-02 15:48:20 -0700 |
commit | f56aa1c57ea921e45bb6cf5d83a04cbc8f38fae5 (patch) | |
tree | f3305833a495bda3db450441f7da855bb9bfcf6d /fs | |
parent | f62185d0e283e9d311e3ac1020f159d95f0aab39 (diff) | |
download | op-kernel-dev-f56aa1c57ea921e45bb6cf5d83a04cbc8f38fae5.zip op-kernel-dev-f56aa1c57ea921e45bb6cf5d83a04cbc8f38fae5.tar.gz |
f2fs: fix to return exact trimmed size
Now, we add all the candidates for trim commands and then finally issue
discard commands.
So, we should count the trimmed size in back-end.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/f2fs/segment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 46283a1..1eb3437 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -544,7 +544,6 @@ static void __add_discard_entry(struct f2fs_sb_info *sbi, list_add_tail(&new->list, head); done: SM_I(sbi)->nr_discards += end - start; - cpc->trimmed += end - start; } static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc) @@ -646,6 +645,7 @@ void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc) if (cpc->reason == CP_DISCARD && entry->len < cpc->trim_minlen) goto skip; f2fs_issue_discard(sbi, entry->blkaddr, entry->len); + cpc->trimmed += entry->len; skip: list_del(&entry->list); SM_I(sbi)->nr_discards -= entry->len; |