diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-10-20 15:12:09 +0200 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | e99b15723885b2224ee9b6b49ff85b55de382f09 (patch) | |
| tree | bf9d633054dc5f2dff2983bb54c6acb8ca1f33f5 | |
| parent | 9e0ee3e756e1bf28299a5d597fcc5aadf238c138 (diff) | |
block: remove bio_is_rw
With the addition of the zoned operations the tests in this function
became incorrect. But I think it's much better to just open code the
allow operations in the only caller anyway.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Shaun Tancheff <shaun.tancheff@seagate.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit c4aebd0332da831a3403faf2035af45059ab6b7c)
| -rw-r--r-- | block/bio-integrity.c | 2 | ||||
| -rw-r--r-- | include/linux/bio.h | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 80dedde0de73..b5009a896a7f 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -172,7 +172,7 @@ bool bio_integrity_enabled(struct bio *bio) { struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); - if (!bio_is_rw(bio)) + if (bio_op(bio) != REQ_OP_READ && bio_op(bio) != REQ_OP_WRITE) return false; if (!bio_sectors(bio)) diff --git a/include/linux/bio.h b/include/linux/bio.h index 97cb48f03dc7..87ce64dafb93 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -83,17 +83,6 @@ static inline bool bio_no_advance_iter(struct bio *bio) bio_op(bio) == REQ_OP_WRITE_SAME; } -static inline bool bio_is_rw(struct bio *bio) -{ - if (!bio_has_data(bio)) - return false; - - if (bio_no_advance_iter(bio)) - return false; - - return true; -} - static inline bool bio_mergeable(struct bio *bio) { if (bio->bi_opf & REQ_NOMERGE_FLAGS) |