diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-10-20 16:12:09 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-10-28 17:45:17 +0300 |
| commit | c4aebd0332da831a3403faf2035af45059ab6b7c (patch) | |
| tree | 42ac63ae9fffaedb92a124603f3e0fc2e7cb0b72 | |
| parent | 2552e3f878c2b43b41d7728a328821d8220c28da (diff) | |
| download | linux-c4aebd0332da831a3403faf2035af45059ab6b7c.tar.xz | |
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>
| -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 63f72f00c72e..5384713d48bc 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; /* Already protected? */ 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) |