diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-02-08 16:46:48 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-08 23:43:06 +0300 |
| commit | 34fe7c05400663e01e23cddd1fea68bb7a2b3d29 (patch) | |
| tree | c03679f3bf7602925ecd9cbd6849af412b06d959 /block/deadline-iosched.c | |
| parent | 6cf7677f1a94546e472658290b3b8bdbb16cc045 (diff) | |
| download | linux-34fe7c05400663e01e23cddd1fea68bb7a2b3d29.tar.xz | |
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/deadline-iosched.c')
| -rw-r--r-- | block/deadline-iosched.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 05fc0ea25a98..c68f6bbc0dcd 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c @@ -120,12 +120,11 @@ static void deadline_remove_request(struct request_queue *q, struct request *rq) deadline_del_rq_rb(dd, rq); } -static int +static enum elv_merge deadline_merge(struct request_queue *q, struct request **req, struct bio *bio) { struct deadline_data *dd = q->elevator->elevator_data; struct request *__rq; - int ret; /* * check for front merge @@ -138,20 +137,17 @@ deadline_merge(struct request_queue *q, struct request **req, struct bio *bio) BUG_ON(sector != blk_rq_pos(__rq)); if (elv_bio_merge_ok(__rq, bio)) { - ret = ELEVATOR_FRONT_MERGE; - goto out; + *req = __rq; + return ELEVATOR_FRONT_MERGE; } } } return ELEVATOR_NO_MERGE; -out: - *req = __rq; - return ret; } static void deadline_merged_request(struct request_queue *q, - struct request *req, int type) + struct request *req, enum elv_merge type) { struct deadline_data *dd = q->elevator->elevator_data; |