Merge tag 'block-6.1-2022-10-20' of git://git.kernel.dk/linux

[linux-block.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 0a14af92373819d6ed25e332ae91c67720d36db9..57c2f327225bd13da2cc00506aeeb2986d13b637 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -867,6 +867,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv,
        *same_page = ((vec_end_addr & PAGE_MASK) == page_addr);
        if (*same_page)
                return true;
+       else if (IS_ENABLED(CONFIG_KMSAN))
+               return false;
        return (bv->bv_page + bv_end / PAGE_SIZE) == (page + off / PAGE_SIZE);
 }