diff options
| author | Chao Yu <yuchao0@huawei.com> | 2018-08-05 18:09:00 +0300 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-08-13 20:48:17 +0300 |
| commit | 6eae269461b84406a1240189e6f81e5234b6393c (patch) | |
| tree | 974b639e31868c00620edf2d56a2eb66b2d82ae2 /fs/f2fs | |
| parent | 22969158083c9e5c92f66718dde1a372baa1a49d (diff) | |
| download | linux-6eae269461b84406a1240189e6f81e5234b6393c.tar.xz | |
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>
Diffstat (limited to 'fs/f2fs')
| -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 3662e1f429b4..eada91dae08a 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2582,8 +2582,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; } |