diff options
| author | Kinglong Mee | 2017-03-08 02:49:53 +0100 |
|---|---|---|
| committer | Jaegeuk Kim | 2017-03-21 21:52:16 +0100 |
| commit | 10a875f82b50adc83036368086df9c4cfff7888c (patch) | |
| tree | d67c8166a09f6e973ad88fc9868f84d5d01e5cfe /fs | |
| parent | f2fs: fix the fault of checking F2FS_LINK_MAX for rename inode (diff) | |
| download | kernel-qcow2-linux-10a875f82b50adc83036368086df9c4cfff7888c.tar.gz kernel-qcow2-linux-10a875f82b50adc83036368086df9c4cfff7888c.tar.xz kernel-qcow2-linux-10a875f82b50adc83036368086df9c4cfff7888c.zip | |
f2fs: fix the fault of calculating blkstart twice
When the zone type is BLK_ZONE_TYPE_CONVENTIONAL, the blkstart is
calculated twice.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
| -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 29ef7088c558..4d7bf84dc393 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -796,6 +796,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, struct block_device *bdev, block_t blkstart, block_t blklen) { sector_t sector, nr_sects; + block_t lblkstart = blkstart; int devi = 0; if (sbi->s_ndevs) { @@ -813,7 +814,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, case BLK_ZONE_TYPE_CONVENTIONAL: if (!blk_queue_discard(bdev_get_queue(bdev))) return 0; - return __f2fs_issue_discard_async(sbi, bdev, blkstart, blklen); + return __f2fs_issue_discard_async(sbi, bdev, lblkstart, blklen); case BLK_ZONE_TYPE_SEQWRITE_REQ: case BLK_ZONE_TYPE_SEQWRITE_PREF: sector = SECTOR_FROM_BLOCK(blkstart); |