nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

block: remove req->timeout_list

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2018-11-09 19:37:44 +01:00 committed by Jens Axboe
parent 27d420bc47
commit 9d037ad707
5 changed files with 0 additions and 18 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
block/blk-core.c
View file

@ -144,7 +144,6 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
memset(rq, 0, sizeof(*rq)); memset(rq, 0, sizeof(*rq));
INIT_LIST_HEAD(&rq->queuelist); INIT_LIST_HEAD(&rq->queuelist);
INIT_LIST_HEAD(&rq->timeout_list);
rq->q = q; rq->q = q;
rq->__sector = (sector_t) -1; rq->__sector = (sector_t) -1;
INIT_HLIST_NODE(&rq->hash); INIT_HLIST_NODE(&rq->hash);

1
block/blk-mq.c
View file

@ -327,7 +327,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,
rq->extra_len = 0; rq->extra_len = 0;
rq->__deadline = 0; rq->__deadline = 0;
INIT_LIST_HEAD(&rq->timeout_list);
rq->timeout = 0; rq->timeout = 0;
rq->end_io = NULL; rq->end_io = NULL;

12
block/blk-timeout.c
View file

@ -68,16 +68,6 @@ ssize_t part_timeout_store(struct device *dev, struct device_attribute *attr,
#endif /* CONFIG_FAIL_IO_TIMEOUT */ #endif /* CONFIG_FAIL_IO_TIMEOUT */
/*
* blk_delete_timer - Delete/cancel timer for a given function.
* @req: request that we are canceling timer for
*
*/
void blk_delete_timer(struct request *req)
{
list_del_init(&req->timeout_list);
}
/** /**
* blk_abort_request -- Request request recovery for the specified command * blk_abort_request -- Request request recovery for the specified command
* @req: pointer to the request of interest * @req: pointer to the request of interest
@ -123,8 +113,6 @@ void blk_add_timer(struct request *req)
struct request_queue *q = req->q; struct request_queue *q = req->q;
unsigned long expiry; unsigned long expiry;
BUG_ON(!list_empty(&req->timeout_list));
/* /*
* Some LLDs, like scsi, peek at the timeout to prevent a * Some LLDs, like scsi, peek at the timeout to prevent a
* command from being retried forever. * command from being retried forever.

2
block/blk.h
View file

@ -222,8 +222,6 @@ static inline bool bio_integrity_endio(struct bio *bio)
unsigned long blk_rq_timeout(unsigned long timeout); unsigned long blk_rq_timeout(unsigned long timeout);
void blk_add_timer(struct request *req); void blk_add_timer(struct request *req);
void blk_delete_timer(struct request *);
bool bio_attempt_front_merge(struct request_queue *q, struct request *req, bool bio_attempt_front_merge(struct request_queue *q, struct request *req,
struct bio *bio); struct bio *bio);

2
include/linux/blkdev.h
View file

@ -228,8 +228,6 @@ struct request {
/* access through blk_rq_set_deadline, blk_rq_deadline */ /* access through blk_rq_set_deadline, blk_rq_deadline */
unsigned long __deadline; unsigned long __deadline;
struct list_head timeout_list;
union { union {
struct __call_single_data csd; struct __call_single_data csd;
u64 fifo_time; u64 fifo_time;