diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-11-02 10:46:15 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-07 15:42:33 -0500 |
| commit | db6d995235606191fa9db0c717e9d843200b71ea (patch) | |
| tree | 830c338347842ac1b0de76d86fbee6bfd7ff9b32 /include/linux/blkdev.h | |
| parent | 1028e4b335665290dc563d5272f3c6b84e7fd66e (diff) | |
block: remove request_list code
It's now dead code, nobody uses it.
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 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 877a3d235c45..e0c661a95c39 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -58,22 +58,6 @@ struct blk_stat_callback; | |||
| 58 | 58 | ||
| 59 | typedef void (rq_end_io_fn)(struct request *, blk_status_t); | 59 | typedef void (rq_end_io_fn)(struct request *, blk_status_t); |
| 60 | 60 | ||
| 61 | struct request_list { | ||
| 62 | struct request_queue *q; /* the queue this rl belongs to */ | ||
| 63 | #ifdef CONFIG_BLK_CGROUP | ||
| 64 | struct blkcg_gq *blkg; /* blkg this request pool belongs to */ | ||
| 65 | #endif | ||
| 66 | /* | ||
| 67 | * count[], starved[], and wait[] are indexed by | ||
| 68 | * BLK_RW_SYNC/BLK_RW_ASYNC | ||
| 69 | */ | ||
| 70 | int count[2]; | ||
| 71 | int starved[2]; | ||
| 72 | mempool_t *rq_pool; | ||
| 73 | wait_queue_head_t wait[2]; | ||
| 74 | unsigned int flags; | ||
| 75 | }; | ||
| 76 | |||
| 77 | /* | 61 | /* |
| 78 | * request flags */ | 62 | * request flags */ |
| 79 | typedef __u32 __bitwise req_flags_t; | 63 | typedef __u32 __bitwise req_flags_t; |
| @@ -259,10 +243,6 @@ struct request { | |||
| 259 | 243 | ||
| 260 | /* for bidi */ | 244 | /* for bidi */ |
| 261 | struct request *next_rq; | 245 | struct request *next_rq; |
| 262 | |||
| 263 | #ifdef CONFIG_BLK_CGROUP | ||
| 264 | struct request_list *rl; /* rl this rq is alloced from */ | ||
| 265 | #endif | ||
| 266 | }; | 246 | }; |
| 267 | 247 | ||
| 268 | static inline bool blk_op_is_scsi(unsigned int op) | 248 | static inline bool blk_op_is_scsi(unsigned int op) |
| @@ -312,8 +292,6 @@ typedef bool (poll_q_fn) (struct request_queue *q, blk_qc_t); | |||
| 312 | struct bio_vec; | 292 | struct bio_vec; |
| 313 | typedef void (softirq_done_fn)(struct request *); | 293 | typedef void (softirq_done_fn)(struct request *); |
| 314 | typedef int (dma_drain_needed_fn)(struct request *); | 294 | typedef int (dma_drain_needed_fn)(struct request *); |
| 315 | typedef int (init_rq_fn)(struct request_queue *, struct request *, gfp_t); | ||
| 316 | typedef void (exit_rq_fn)(struct request_queue *, struct request *); | ||
| 317 | 295 | ||
| 318 | enum blk_eh_timer_return { | 296 | enum blk_eh_timer_return { |
| 319 | BLK_EH_DONE, /* drivers has completed the command */ | 297 | BLK_EH_DONE, /* drivers has completed the command */ |
| @@ -427,22 +405,10 @@ struct request_queue { | |||
| 427 | struct blk_queue_stats *stats; | 405 | struct blk_queue_stats *stats; |
| 428 | struct rq_qos *rq_qos; | 406 | struct rq_qos *rq_qos; |
| 429 | 407 | ||
| 430 | /* | ||
| 431 | * If blkcg is not used, @q->root_rl serves all requests. If blkcg | ||
| 432 | * is used, root blkg allocates from @q->root_rl and all other | ||
| 433 | * blkgs from their own blkg->rl. Which one to use should be | ||
| 434 | * determined using bio_request_list(). | ||
| 435 | */ | ||
| 436 | struct request_list root_rl; | ||
| 437 | |||
| 438 | make_request_fn *make_request_fn; | 408 | make_request_fn *make_request_fn; |
| 439 | poll_q_fn *poll_fn; | 409 | poll_q_fn *poll_fn; |
| 440 | softirq_done_fn *softirq_done_fn; | 410 | softirq_done_fn *softirq_done_fn; |
| 441 | dma_drain_needed_fn *dma_drain_needed; | 411 | dma_drain_needed_fn *dma_drain_needed; |
| 442 | /* Called just after a request is allocated */ | ||
| 443 | init_rq_fn *init_rq_fn; | ||
| 444 | /* Called just before a request is freed */ | ||
| 445 | exit_rq_fn *exit_rq_fn; | ||
| 446 | 412 | ||
| 447 | const struct blk_mq_ops *mq_ops; | 413 | const struct blk_mq_ops *mq_ops; |
| 448 | 414 | ||
