diff options
| author | Ming Lei <ming.lei@redhat.com> | 2019-03-29 08:07:54 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-04-01 20:11:13 +0200 |
| commit | 0383ad4374f7ad7edd925a2ee4753035c3f5508a (patch) | |
| tree | 9c79f466839188b74a3a69e2c3f87b806800188d /block/blk.h | |
| parent | loop: properly observe rotational flag of underlying device (diff) | |
| download | linux-0383ad4374f7ad7edd925a2ee4753035c3f5508a.tar.xz linux-0383ad4374f7ad7edd925a2ee4753035c3f5508a.zip | |
block: pass page to xen_biovec_phys_mergeable
xen_biovec_phys_mergeable() only needs .bv_page of the 2nd bio bvec
for checking if the two bvecs can be merged, so pass page to
xen_biovec_phys_mergeable() directly.
No function change.
Cc: ris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: xen-devel@lists.xenproject.org
Cc: Omar Sandoval <osandov@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index 5d636ee41663..e27fd1512e4b 100644 --- a/block/blk.h +++ b/block/blk.h @@ -75,7 +75,7 @@ static inline bool biovec_phys_mergeable(struct request_queue *q, if (addr1 + vec1->bv_len != addr2) return false; - if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2)) + if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2->bv_page)) return false; if ((addr1 | mask) != ((addr2 + vec2->bv_len - 1) | mask)) return false; |