write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/xen/biomerge.c
..
..
@@ -1,15 +1,16 @@
1
1
 // SPDX-License-Identifier: GPL-2.0
2
2
 #include <linux/bio.h>
3
-#include <linux/io.h>
4
3
 #include <linux/export.h>
4
+#include <xen/xen.h>
5
5
 #include <xen/page.h>
6
6
 
7
+/* check if @page can be merged with 'vec1' */
7
8
 bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
8
-			       const struct bio_vec *vec2)
9
+			       const struct page *page)
9
10
 {
10
11
 #if XEN_PAGE_SIZE == PAGE_SIZE
11
12
 	unsigned long bfn1 = pfn_to_bfn(page_to_pfn(vec1->bv_page));
12
-	unsigned long bfn2 = pfn_to_bfn(page_to_pfn(vec2->bv_page));
13
+	unsigned long bfn2 = pfn_to_bfn(page_to_pfn(page));
13
14
 
14
15
 	return bfn1 + PFN_DOWN(vec1->bv_offset + vec1->bv_len) == bfn2;
15
16
 #else
..
..
@@ -20,4 +21,3 @@
20
21
 	return false;
21
22
 #endif
22
23
 }
23
-EXPORT_SYMBOL(xen_biovec_phys_mergeable);