Browse Source

bcache: use op_is_sync to check for synchronous requests

(and remove one layer of masking for the op_is_write call next to it).

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Christoph Hellwig 8 years ago
parent
commit
83b5df67c5
2 changed files with 3 additions and 4 deletions
  1. 2 2
      drivers/md/bcache/request.c
  2. 1 2
      drivers/md/bcache/writeback.h

+ 2 - 2
drivers/md/bcache/request.c

@@ -404,8 +404,8 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio)
 
 
 	if (!congested &&
 	if (!congested &&
 	    mode == CACHE_MODE_WRITEBACK &&
 	    mode == CACHE_MODE_WRITEBACK &&
-	    op_is_write(bio_op(bio)) &&
-	    (bio->bi_opf & REQ_SYNC))
+	    op_is_write(bio->bi_opf) &&
+	    op_is_sync(bio->bi_opf))
 		goto rescale;
 		goto rescale;
 
 
 	spin_lock(&dc->io_lock);
 	spin_lock(&dc->io_lock);

+ 1 - 2
drivers/md/bcache/writeback.h

@@ -57,8 +57,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio,
 	if (would_skip)
 	if (would_skip)
 		return false;
 		return false;
 
 
-	return bio->bi_opf & REQ_SYNC ||
-		in_use <= CUTOFF_WRITEBACK;
+	return op_is_sync(bio->bi_opf) || in_use <= CUTOFF_WRITEBACK;
 }
 }
 
 
 static inline void bch_writeback_queue(struct cached_dev *dc)
 static inline void bch_writeback_queue(struct cached_dev *dc)