diff options
| author | Chao Yu <yuchao0@huawei.com> | 2018-08-05 23:09:00 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-09-18 14:42:39 -0700 |
| commit | 3fbe7eea3365e6ccc4e190086fcc762705eda103 (patch) | |
| tree | ceb0e018a98900e14db181958ae5d0354ca3ed96 | |
| parent | a307972a12dd6c8c0296a62c407b666e880d0738 (diff) | |
f2fs: fix incorrect range->len in f2fs_trim_fs()
generic/260 reported below error:
[+] Default length with start set (should succeed)
[+] Length beyond the end of fs (should succeed)
[+] Length beyond the end of fs with start set (should succeed)
+./tests/generic/260: line 94: [: 18446744073709551615: integer expression expected
+./tests/generic/260: line 104: [: 18446744073709551615: integer expression expected
Test done
...
In f2fs_trim_fs(), if there is no discard being trimmed, we need to correct
range->len before return.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/segment.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index e067d4768360..6dec5ab7dd52 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2662,8 +2662,9 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range) trimmed += __wait_discard_cmd_range(sbi, &dpolicy, start_block, end_block); - range->len = F2FS_BLK_TO_BYTES(trimmed); out: + if (!err) + range->len = F2FS_BLK_TO_BYTES(trimmed); return err; } |