Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: don't check ->rq_disk in merges

There is a 1:1 relationship between request_queues and gendisks now, so
no need for these extra checks.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20211126121802.2090656-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe
79bb1dbd 82baa324

+1 -6
+1 -6
block/blk-merge.c
··· 777 777 if (req_op(req) != req_op(next)) 778 778 return NULL; 779 779 780 - if (rq_data_dir(req) != rq_data_dir(next) 781 - || req->rq_disk != next->rq_disk) 780 + if (rq_data_dir(req) != rq_data_dir(next)) 782 781 return NULL; 783 782 784 783 if (req_op(req) == REQ_OP_WRITE_SAME && ··· 902 903 903 904 /* different data direction or already started, don't merge */ 904 905 if (bio_data_dir(bio) != rq_data_dir(rq)) 905 - return false; 906 - 907 - /* must be same device */ 908 - if (rq->rq_disk != bio->bi_bdev->bd_disk) 909 906 return false; 910 907 911 908 /* only merge integrity protected bio into ditto rq */