luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skd_main: don't use req->special

Browse Source 
Add a retries field to the internal request structure instead, which gets
set to zero on the first submission.

Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-11-10 09:30:46 +01:00 committed by Jens Axboe
parent 49f6613632
commit 1bee42438f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/skd_main.c
View File

@ -181,6 +181,7 @@ struct skd_request_context {
struct fit_completion_entry_v1 completion; struct fit_completion_entry_v1 completion;
struct fit_comp_error_info err_info; struct fit_comp_error_info err_info;
int retries;
blk_status_t status; blk_status_t status;
}; };
@ -495,6 +496,11 @@ static blk_status_t skd_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
if (unlikely(skdev->state != SKD_DRVR_STATE_ONLINE)) if (unlikely(skdev->state != SKD_DRVR_STATE_ONLINE))
return skd_fail_all(q) ? BLK_STS_IOERR : BLK_STS_RESOURCE; return skd_fail_all(q) ? BLK_STS_IOERR : BLK_STS_RESOURCE;
if (!(req->rq_flags & RQF_DONTPREP)) {
skreq->retries = 0;
req->rq_flags |= RQF_DONTPREP;
}
blk_mq_start_request(req); blk_mq_start_request(req);
WARN_ONCE(tag >= skd_max_queue_depth, "%#x > %#x (nr_requests = %lu)\n", WARN_ONCE(tag >= skd_max_queue_depth, "%#x > %#x (nr_requests = %lu)\n",
@ -1426,7 +1432,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev,
break; break;
case SKD_CHECK_STATUS_REQUEUE_REQUEST: case SKD_CHECK_STATUS_REQUEUE_REQUEST:
if ((unsigned long) ++req->special < SKD_MAX_RETRIES) { if (++skreq->retries < SKD_MAX_RETRIES) {
skd_log_skreq(skdev, skreq, "retry"); skd_log_skreq(skdev, skreq, "retry");
blk_mq_requeue_request(req, true); blk_mq_requeue_request(req, true);
break; break;