Skip to content

Commit

Permalink
scsi_transport_fc: complete requests from ->timeout
Browse files Browse the repository at this point in the history
By completing the request entirely in the driver we can remove the
BLK_EH_HANDLED return value and thus the split responsibility between the
driver and the block layer that has been causing trouble.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed May 29, 2018
1 parent 0df0bb0 commit 1fc2b62
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/scsi/scsi_transport_fc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3591,10 +3591,9 @@ fc_bsg_job_timeout(struct request *req)
}

/* the blk_end_sync_io() doesn't check the error */
if (!inflight)
return BLK_EH_DONE;
else
return BLK_EH_HANDLED;
if (inflight)
blk_mq_complete_request(req);
return BLK_EH_DONE;
}

/**
Expand Down

0 comments on commit 1fc2b62

Please sign in to comment.