block: pass page to xen_biovec_phys_mergeable

[ Upstream commit 0383ad4374f7ad7edd925a2ee4753035c3f5508a ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/block/blk.h b/block/blk.h
index 848278c520306819c39f61c49ffc841577f590dc..a57bc90e44bb25e854480e171d17e6b3c9da11b8 100644 (file)
--- 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;

diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c
index f3fbb700f56973d88da90d3aaca44598114fcaae..05a286d24f1482f77ccea9999577b46cb96ee3c7 100644 (file)
--- a/drivers/xen/biomerge.c
+++ b/drivers/xen/biomerge.c
@@ -4,12 +4,13 @@
 #include <xen/xen.h>
 #include <xen/page.h>
 
+/* check if @page can be merged with 'vec1' */
 bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
-                              const struct bio_vec *vec2)
+                              const struct page *page)
 {
 #if XEN_PAGE_SIZE == PAGE_SIZE
        unsigned long bfn1 = pfn_to_bfn(page_to_pfn(vec1->bv_page));
-       unsigned long bfn2 = pfn_to_bfn(page_to_pfn(vec2->bv_page));
+       unsigned long bfn2 = pfn_to_bfn(page_to_pfn(page));
 
        return bfn1 + PFN_DOWN(vec1->bv_offset + vec1->bv_len) == bfn2;
 #else

diff --git a/include/xen/xen.h b/include/xen/xen.h
index 0e2156786ad29ff1645269377e9d794dfb2aaada..e1ba6921bc8eba657a4d6a86655f45b166753b17 100644 (file)
--- a/include/xen/xen.h
+++ b/include/xen/xen.h
@@ -43,7 +43,9 @@ extern struct hvm_start_info pvh_start_info;
 #endif /* CONFIG_XEN_DOM0 */
 
 struct bio_vec;
+struct page;
+
 bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
-               const struct bio_vec *vec2);
+               const struct page *page);
 
 #endif /* _XEN_XEN_H */