diff options
| author |   Christoph Hellwig <hch@lst.de> | 2017-06-19 09:24:41 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2017-06-20 19:21:48 -0600 |
| commit | efbeccdb59d666b9c77d505af01097cc0a9d102b (patch) | |
| tree | 158e3bcab08c68fc06359e8976df122476626657 /include/linux/blkdev.h | |
| parent | block: remove the unused bio_to_phys macro (diff) | |
| download | linux-dev-efbeccdb59d666b9c77d505af01097cc0a9d102b.tar.xz linux-dev-efbeccdb59d666b9c77d505af01097cc0a9d102b.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 22cfba64ce81..0deed7274a7f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -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; |