|
@@ -383,7 +383,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)
|
|
|
|
|
|
if (mode == CACHE_MODE_NONE ||
|
|
|
(mode == CACHE_MODE_WRITEAROUND &&
|
|
|
- (bio->bi_rw & REQ_WRITE)))
|
|
|
+ op_is_write(bio_op(bio))))
|
|
|
goto skip;
|
|
|
|
|
|
if (bio->bi_iter.bi_sector & (c->sb.block_size - 1) ||
|
|
@@ -404,7 +404,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)
|
|
|
|
|
|
if (!congested &&
|
|
|
mode == CACHE_MODE_WRITEBACK &&
|
|
|
- (bio->bi_rw & REQ_WRITE) &&
|
|
|
+ op_is_write(bio_op(bio)) &&
|
|
|
(bio->bi_rw & REQ_SYNC))
|
|
|
goto rescale;
|
|
|
|
|
@@ -657,7 +657,7 @@ static inline struct search *search_alloc(struct bio *bio,
|
|
|
s->cache_miss = NULL;
|
|
|
s->d = d;
|
|
|
s->recoverable = 1;
|
|
|
- s->write = (bio->bi_rw & REQ_WRITE) != 0;
|
|
|
+ s->write = op_is_write(bio_op(bio));
|
|
|
s->read_dirty_data = 0;
|
|
|
s->start_time = jiffies;
|
|
|
|