redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Christoph Hellwig 2017-06-19 09:24:41 +02:00 committed by Jens Axboe
parent 80ab6af432
commit efbeccdb59
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/blkdev.h
View File

@ -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;