diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blk-mq.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 0cf6735046d3..b144b7b0e104 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h | |||
| @@ -87,7 +87,8 @@ struct blk_mq_queue_data { | |||
| 87 | bool last; | 87 | bool last; |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, const struct blk_mq_queue_data *); | 90 | typedef blk_status_t (queue_rq_fn)(struct blk_mq_hw_ctx *, |
| 91 | const struct blk_mq_queue_data *); | ||
| 91 | typedef enum blk_eh_timer_return (timeout_fn)(struct request *, bool); | 92 | typedef enum blk_eh_timer_return (timeout_fn)(struct request *, bool); |
| 92 | typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int); | 93 | typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int); |
| 93 | typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int); | 94 | typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int); |
| @@ -155,10 +156,6 @@ struct blk_mq_ops { | |||
| 155 | }; | 156 | }; |
| 156 | 157 | ||
| 157 | enum { | 158 | enum { |
| 158 | BLK_MQ_RQ_QUEUE_OK = 0, /* queued fine */ | ||
| 159 | BLK_MQ_RQ_QUEUE_BUSY = 1, /* requeue IO for later */ | ||
| 160 | BLK_MQ_RQ_QUEUE_ERROR = 2, /* end IO with error */ | ||
| 161 | |||
| 162 | BLK_MQ_F_SHOULD_MERGE = 1 << 0, | 159 | BLK_MQ_F_SHOULD_MERGE = 1 << 0, |
| 163 | BLK_MQ_F_TAG_SHARED = 1 << 1, | 160 | BLK_MQ_F_TAG_SHARED = 1 << 1, |
| 164 | BLK_MQ_F_SG_MERGE = 1 << 2, | 161 | BLK_MQ_F_SG_MERGE = 1 << 2, |
