f2fs: ignore discard return value

__blkdev_issue_discard() always returns 0, making the error assignment
in __submit_discard_cmd() dead code.

Initialize err to 0 and remove the error assignment from the
__blkdev_issue_discard() call to err. Move fault injection code into
already present if branch where err is set to -EIO.

This preserves the fault injection behavior while removing dead error
handling.

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by Chaitanya Kulkarni and committed by Jaegeuk Kim 76ee7fd6 8d1cb17a

+3 -7
+3 -7
fs/f2fs/segment.c
··· 1343 1344 dc->di.len += len; 1345 1346 if (time_to_inject(sbi, FAULT_DISCARD)) { 1347 err = -EIO; 1348 - } else { 1349 - err = __blkdev_issue_discard(bdev, 1350 - SECTOR_FROM_BLOCK(start), 1351 - SECTOR_FROM_BLOCK(len), 1352 - GFP_NOFS, &bio); 1353 - } 1354 - if (err) { 1355 spin_lock_irqsave(&dc->lock, flags); 1356 if (dc->state == D_PARTIAL) 1357 dc->state = D_SUBMIT; ··· 1354 break; 1355 } 1356 1357 f2fs_bug_on(sbi, !bio); 1358 1359 /*
··· 1343 1344 dc->di.len += len; 1345 1346 + err = 0; 1347 if (time_to_inject(sbi, FAULT_DISCARD)) { 1348 err = -EIO; 1349 spin_lock_irqsave(&dc->lock, flags); 1350 if (dc->state == D_PARTIAL) 1351 dc->state = D_SUBMIT; ··· 1360 break; 1361 } 1362 1363 + __blkdev_issue_discard(bdev, SECTOR_FROM_BLOCK(start), 1364 + SECTOR_FROM_BLOCK(len), GFP_NOFS, &bio); 1365 f2fs_bug_on(sbi, !bio); 1366 1367 /*