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>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 8375dca7ed9e49aaf6ae7587a4326c2e50b42db9..c26424f476863547f5efbb5d3bcdc74df54b0b27 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1343,15 +1343,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 
                dc->di.len += len;
 
+               err = 0;
                if (time_to_inject(sbi, FAULT_DISCARD)) {
                        err = -EIO;
-               } else {
-                       err = __blkdev_issue_discard(bdev,
-                                       SECTOR_FROM_BLOCK(start),
-                                       SECTOR_FROM_BLOCK(len),
-                                       GFP_NOFS, &bio);
-               }
-               if (err) {
                        spin_lock_irqsave(&dc->lock, flags);
                        if (dc->state == D_PARTIAL)
                                dc->state = D_SUBMIT;
@@ -1360,6 +1354,8 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
                        break;
                }
 
+               __blkdev_issue_discard(bdev, SECTOR_FROM_BLOCK(start),
+                               SECTOR_FROM_BLOCK(len), GFP_NOFS, &bio);
                f2fs_bug_on(sbi, !bio);
 
                /*