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>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 46283a153acfcd9c21a9b0877992345417cc3ff0..1eb343768781f3c4c89e0f6ecc2694d9a4c61c75 100644 (file)
--- 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;