diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-05 14:31:48 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-07 13:41:38 -0600 |
| commit | 95fe6c1a209ef89d9f94dd04a0ad72be1487d5d5 (patch) | |
| tree | 4f0b5eabb7d38efe2f17e61207c628a1de8bb6ea /drivers/block/brd.c | |
| parent | c8d93247f1d0cf478222a7f4fc37d453d6193d04 (diff) | |
| download | linux-next-95fe6c1a209ef89d9f94dd04a0ad72be1487d5d5.tar.gz | |
block, fs, mm, drivers: use bio set/get op accessors
This patch converts the simple bi_rw use cases in the block,
drivers, mm and fs code to set/get the bio operation using
bio_set_op_attrs/bio_op
These should be simple one or two liner cases, so I just did them
in one patch. The next patches handle the more complicated
cases in a module per patch.
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/block/brd.c')
| -rw-r--r-- | drivers/block/brd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index c04bd9bc39fd..f5b0d6f4e09f 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -339,7 +339,7 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio) if (bio_end_sector(bio) > get_capacity(bdev->bd_disk)) goto io_error; - if (unlikely(bio->bi_rw & REQ_DISCARD)) { + if (unlikely(bio_op(bio) == REQ_OP_DISCARD)) { if (sector & ((PAGE_SIZE >> SECTOR_SHIFT) - 1) || bio->bi_iter.bi_size & ~PAGE_MASK) goto io_error; |