Commit efbeccdb authored Jun 19, 2017 by Christoph Hellwig Committed by Jens Axboe Jun 20, 2017

block: stop using bio_data() in blk_write_same_mergeable



While the Write Same page currently always is in low-level it is just
as easy and safer to just compare the page and offset directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 80ab6af4

include/linux/blkdev.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -815,7 +815,8 @@ static inline bool rq_mergeable(struct request *rq)

		static inline bool blk_write_same_mergeable(struct bio a, struct bio b)
		{
		if (bio_data(a) == bio_data(b))
		if (bio_page(a) == bio_page(b) &&
		bio_offset(a) == bio_offset(b))
		return true;

		return false;