diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-11-01 16:40:02 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-11-01 18:43:26 +0300 |
| commit | aa39ebd404423e62f74cfd3e27e9ffe7e38b2a25 (patch) | |
| tree | c7480711eb50e146e973c513685c0d2528081dca /block/cfq-iosched.c | |
| parent | 87374179c535a98337569904727aa02f960fe79e (diff) | |
| download | linux-aa39ebd404423e62f74cfd3e27e9ffe7e38b2a25.tar.xz | |
cfq-iosched: use op_is_sync instead of opencoding it
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index c96186adaa66..f28db97c3fe0 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -912,15 +912,6 @@ static inline struct cfq_data *cic_to_cfqd(struct cfq_io_cq *cic) } /* - * We regard a request as SYNC, if it's either a read or has the SYNC bit - * set (in which case it could also be direct WRITE). - */ -static inline bool cfq_bio_sync(struct bio *bio) -{ - return bio_data_dir(bio) == READ || (bio->bi_opf & REQ_SYNC); -} - -/* * scheduler run of queue, if there are requests pending and no one in the * driver that will restart queueing */ @@ -2490,7 +2481,7 @@ cfq_find_rq_fmerge(struct cfq_data *cfqd, struct bio *bio) if (!cic) return NULL; - cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio)); + cfqq = cic_to_cfqq(cic, op_is_sync(bio->bi_opf)); if (cfqq) return elv_rb_find(&cfqq->sort_list, bio_end_sector(bio)); @@ -2604,13 +2595,14 @@ static int cfq_allow_bio_merge(struct request_queue *q, struct request *rq, struct bio *bio) { struct cfq_data *cfqd = q->elevator->elevator_data; + bool is_sync = op_is_sync(bio->bi_opf); struct cfq_io_cq *cic; struct cfq_queue *cfqq; /* * Disallow merge of a sync bio into an async request. */ - if (cfq_bio_sync(bio) && !rq_is_sync(rq)) + if (is_sync && !rq_is_sync(rq)) return false; /* @@ -2621,7 +2613,7 @@ static int cfq_allow_bio_merge(struct request_queue *q, struct request *rq, if (!cic) return false; - cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio)); + cfqq = cic_to_cfqq(cic, is_sync); return cfqq == RQ_CFQQ(rq); } |