forked from luck/tmp_suning_uos_patched
block: avoid to break XEN by multi-page bvec
XEN has special page merge requirement, see xen_biovec_phys_mergeable(). We can't merge pages into one bvec simply for XEN. So move XEN's specific check on page merge into __bio_try_merge_page(), then abvoid to break XEN by multi-page bvec. Cc: ris Ostrovsky <boris.ostrovsky@oracle.com> Cc: xen-devel@lists.xenproject.org Cc: Omar Sandoval <osandov@fb.com> Cc: Christoph Hellwig <hch@lst.de> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
0383ad4374
commit
db5ebd6edd
|
@ -776,6 +776,8 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
|
|||
|
||||
if (vec_end_addr + 1 != page_addr + off)
|
||||
return false;
|
||||
if (xen_domain() && !xen_biovec_phys_mergeable(bv, page))
|
||||
return false;
|
||||
if (same_page && (vec_end_addr & PAGE_MASK) != page_addr)
|
||||
return false;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user