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 <[email protected]>
Reviewed-by: Shaun Tancheff <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 63f72f00c72eef45640d68fad4579fca271235ed..5384713d48bc9929e2a4dc8b1b9f22b2e1c5bcd3 100644 (file)
--- 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 97cb48f03dc73ce701668891f3fd4f6f70ab9004..87ce64dafb93ad99508f5dbaf470e992c7f15d58 100644 (file)
--- 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)