diff options
author | Mike Christie <mchristi@redhat.com> | 2016-06-05 15:31:45 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-06-07 15:41:38 -0400 |
commit | a8ebb056a8aeb58aafef0af241a6b3ac34ac86bd (patch) | |
tree | a656dfc59d3082470756b7828361eedfce5f49a5 /drivers/ata | |
parent | dfec8a14fc9043039e3c04807caf39dc71102816 (diff) |
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>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/libata-scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index bfec66fb26e2..4c6eb22cc85d 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -1190,7 +1190,7 @@ static int atapi_drain_needed(struct request *rq) | |||
1190 | if (likely(rq->cmd_type != REQ_TYPE_BLOCK_PC)) | 1190 | if (likely(rq->cmd_type != REQ_TYPE_BLOCK_PC)) |
1191 | return 0; | 1191 | return 0; |
1192 | 1192 | ||
1193 | if (!blk_rq_bytes(rq) || (rq->cmd_flags & REQ_WRITE)) | 1193 | if (!blk_rq_bytes(rq) || op_is_write(req_op(rq))) |
1194 | return 0; | 1194 | return 0; |
1195 | 1195 | ||
1196 | return atapi_cmd_type(rq->cmd[0]) == ATAPI_MISC; | 1196 | return atapi_cmd_type(rq->cmd[0]) == ATAPI_MISC; |