Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4aebd03 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarShaun Tancheff <shaun.tancheff@seagate.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2552e3f8

block/bio-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -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? */

include/linux/bio.h

+0 −11
Original line number Diff line number Diff line
@@ -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)