diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-05 14:31:46 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-07 13:41:38 -0600 |
| commit | 511116669346a0029b7e54eaaa8e5a7029f89ab3 (patch) | |
| tree | 682fc23a7cf203d3762c7f284598a2895914ed5e /drivers/md/dm-io.c | |
| parent | a8ebb056a8aeb58aafef0af241a6b3ac34ac86bd (diff) | |
| download | linux-stable-511116669346a0029b7e54eaaa8e5a7029f89ab3.tar.gz linux-stable-511116669346a0029b7e54eaaa8e5a7029f89ab3.tar.bz2 linux-stable-511116669346a0029b7e54eaaa8e5a7029f89ab3.zip | |
dm: use op_is_write 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 has dm use the op_is_write helper which will do the right
thing.
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/md/dm-io.c')
| -rw-r--r-- | drivers/md/dm-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index 50f17e32951a..26e9a85e3356 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c @@ -409,7 +409,7 @@ static int sync_io(struct dm_io_client *client, unsigned int num_regions, struct io *io; struct sync_io sio; - if (num_regions > 1 && (rw & RW_MASK) != WRITE) { + if (num_regions > 1 && !op_is_write(rw)) { WARN_ON(1); return -EIO; } @@ -442,7 +442,7 @@ static int async_io(struct dm_io_client *client, unsigned int num_regions, { struct io *io; - if (num_regions > 1 && (rw & RW_MASK) != WRITE) { + if (num_regions > 1 && !op_is_write(rw)) { WARN_ON(1); fn(1, context); return -EIO; |