Skip to content

Commit 9d037ad

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: remove req->timeout_list
Unused now that the legacy request path is gone. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 27d420b commit 9d037ad

File tree

5 files changed

+0
-18
lines changed

5 files changed

+0
-18
lines changed

block/blk-core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
144144
memset(rq, 0, sizeof(*rq));
145145

146146
INIT_LIST_HEAD(&rq->queuelist);
147-
INIT_LIST_HEAD(&rq->timeout_list);
148147
rq->q = q;
149148
rq->__sector = (sector_t) -1;
150149
INIT_HLIST_NODE(&rq->hash);

block/blk-mq.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,
327327
rq->extra_len = 0;
328328
rq->__deadline = 0;
329329

330-
INIT_LIST_HEAD(&rq->timeout_list);
331330
rq->timeout = 0;
332331

333332
rq->end_io = NULL;

block/blk-timeout.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,6 @@ ssize_t part_timeout_store(struct device *dev, struct device_attribute *attr,
6868

6969
#endif /* CONFIG_FAIL_IO_TIMEOUT */
7070

71-
/*
72-
* blk_delete_timer - Delete/cancel timer for a given function.
73-
* @req: request that we are canceling timer for
74-
*
75-
*/
76-
void blk_delete_timer(struct request *req)
77-
{
78-
list_del_init(&req->timeout_list);
79-
}
80-
8171
/**
8272
* blk_abort_request -- Request request recovery for the specified command
8373
* @req: pointer to the request of interest
@@ -123,8 +113,6 @@ void blk_add_timer(struct request *req)
123113
struct request_queue *q = req->q;
124114
unsigned long expiry;
125115

126-
BUG_ON(!list_empty(&req->timeout_list));
127-
128116
/*
129117
* Some LLDs, like scsi, peek at the timeout to prevent a
130118
* command from being retried forever.

block/blk.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ static inline bool bio_integrity_endio(struct bio *bio)
222222

223223
unsigned long blk_rq_timeout(unsigned long timeout);
224224
void blk_add_timer(struct request *req);
225-
void blk_delete_timer(struct request *);
226-
227225

228226
bool bio_attempt_front_merge(struct request_queue *q, struct request *req,
229227
struct bio *bio);

include/linux/blkdev.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@ struct request {
228228
/* access through blk_rq_set_deadline, blk_rq_deadline */
229229
unsigned long __deadline;
230230

231-
struct list_head timeout_list;
232-
233231
union {
234232
struct __call_single_data csd;
235233
u64 fifo_time;

0 commit comments

Comments
 (0)