diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-02-08 14:46:48 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-08 13:43:06 -0700 |
| commit | 34fe7c05400663e01e23cddd1fea68bb7a2b3d29 (patch) | |
| tree | c03679f3bf7602925ecd9cbd6849af412b06d959 /block/blk.h | |
| parent | 6cf7677f1a94546e472658290b3b8bdbb16cc045 (diff) | |
| download | linux-34fe7c05400663e01e23cddd1fea68bb7a2b3d29.tar.gz linux-34fe7c05400663e01e23cddd1fea68bb7a2b3d29.tar.bz2 linux-34fe7c05400663e01e23cddd1fea68bb7a2b3d29.zip | |
block: enumify ELEVATOR_*_MERGE
Switch these constants to an enum, and make let the compiler ensure that
all callers of blk_try_merge and elv_merge handle all potential values.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index 3e08703902a9..ae82f2ac4019 100644 --- a/block/blk.h +++ b/block/blk.h @@ -215,7 +215,7 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq, void blk_recalc_rq_segments(struct request *rq); void blk_rq_set_mixed_merge(struct request *rq); bool blk_rq_merge_ok(struct request *rq, struct bio *bio); -int blk_try_merge(struct request *rq, struct bio *bio); +enum elv_merge blk_try_merge(struct request *rq, struct bio *bio); void blk_queue_congestion_threshold(struct request_queue *q); |