Merge patch series "Fix RISC-V toolchain extension support detection"

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

diff --git a/block/bio.c b/block/bio.c
index 7cb7d2ff139baa16959b6b170f209f3972b0c9f9..633a902468ec7f10f91f18edb5e6e083eb3f6652 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -567,7 +567,7 @@ EXPORT_SYMBOL(bio_alloc_bioset);
  * be reused by calling bio_uninit() before calling bio_init() again.
  *
  * Note that unlike bio_alloc() or bio_alloc_bioset() allocations from this
- * function are not backed by a mempool can can fail.  Do not use this function
+ * function are not backed by a mempool can fail.  Do not use this function
  * for allocations in the file system I/O path.
  *
  * Returns: Pointer to new bio on success, NULL on failure.
@@ -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);
 }