block, drivers, cgroup: use op_is_write helper instead of checking for REQ_WRITE

We currently set REQ_WRITE/WRITE for all non READ IOs
like discard, flush, writesame, etc. In the next patches where we
no longer set up the op as a bitmap, we will not be able to
detect a operation direction like writesame by testing if REQ_WRITE is
set.

This patch converts the drivers and cgroup to use the
op_is_write helper. This should just cover the simple
cases. I did dm, md and bcache in their own patches
because they were more involved.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index e95340789592..e8e5865a53e2 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2115,7 +2115,7 @@ blk_qc_t submit_bio(struct bio *bio)
                 else
                         count = bio_sectors(bio);
 
-                if (bio->bi_rw & WRITE) {
+                if (op_is_write(bio_op(bio))) {
                         count_vm_events(PGPGOUT, count);
                 } else {
                         task_io_account_read(bio->bi_iter.bi_size);
@@ -2126,7 +2126,7 @@ blk_qc_t submit_bio(struct bio *bio)
                         char b[BDEVNAME_SIZE];
                         printk(KERN_DEBUG "%s(%d): %s block %Lu on %s (%u sectors)\n",
                         current->comm, task_pid_nr(current),
-                                (bio->bi_rw & WRITE) ? "WRITE" : "READ",
+                                op_is_write(bio_op(bio)) ? "WRITE" : "READ",
                                 (unsigned long long)bio->bi_iter.bi_sector,
                                 bdevname(bio->bi_bdev, b),
                                 count);