summaryrefslogtreecommitdiff
path: root/block/bsg-lib.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-10-29 10:25:07 -0600
committerJens Axboe <axboe@kernel.dk>2018-11-07 13:42:33 -0700
commit4316b79e4321d4140164e42f228778e5bc66c84f (patch)
treecb499b7b547f1c1d17c0b72fbd77841314c8ff1f /block/bsg-lib.c
parent92bc5a24844ada9b010f03c49a493e3edeadaa54 (diff)
downloadlinux-next-4316b79e4321d4140164e42f228778e5bc66c84f.tar.gz
block: kill legacy parts of timeout handling
The only user of legacy timing now is BSG, which is invoked from the mq timeout handler. Kill the legacy code, and rename the q->rq_timed_out_fn to q->bsg_job_timeout_fn. Reviewed-by: Hannes Reinecke <hare@suse.com> Tested-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bsg-lib.c')
-rw-r--r--block/bsg-lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index faf20f4500c9..f38c7bc272c0 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -307,8 +307,8 @@ static enum blk_eh_timer_return bsg_timeout(struct request *rq, bool reserved)
enum blk_eh_timer_return ret = BLK_EH_DONE;
struct request_queue *q = rq->q;
- if (q->rq_timed_out_fn)
- ret = q->rq_timed_out_fn(rq);
+ if (q->bsg_job_timeout_fn)
+ ret = q->bsg_job_timeout_fn(rq);
return ret;
}
@@ -357,9 +357,9 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
q->queuedata = dev;
q->bsg_job_fn = job_fn;
+ q->bsg_job_timeout_fn = timeout;
blk_queue_flag_set(QUEUE_FLAG_BIDI, q);
blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
- q->rq_timed_out_fn = timeout;
ret = bsg_register_queue(q, dev, name, &bsg_transport_ops);
if (ret) {