Date: Sat, 6 Mar 2021 20:25:33 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d2faf2e6b2d4 - releng/13.0 - zfs: fix assert in FreeBSD-specific dmu_read_pages Message-ID: <202103062025.126KPXxC074477@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/13.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d2faf2e6b2d43eafbae27a6d4909984c260e2631 commit d2faf2e6b2d43eafbae27a6d4909984c260e2631 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2021-03-03 01:32:59 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2021-03-06 20:23:22 +0000 zfs: fix assert in FreeBSD-specific dmu_read_pages From the openzfs 2e160dee9 commit message: The function has three similar pieces of code: for read-behind pages, requested pages and read-ahead pages. All three pieces had an assert to ensure that the page is not mapped. Later the assert was relaxed to require that the page is not mapped for writing. But that was done in two places out of three. This change fixes the third piece, read-ahead. Obtained from: openzfs/zfs@2e160dee97a4badbc318561f76ea56451c916d2f Approved by: re (delphij) (cherry picked from commit 19049a2b2bd7119ef7b34102513f6bbfdf9ff862) --- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c index 8e412d9c1359..fb8f560316ea 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c @@ -319,7 +319,7 @@ dmu_read_pages(objset_t *os, uint64_t object, vm_page_t *ma, int count, break; } ASSERT(m->dirty == 0); - ASSERT(!pmap_page_is_mapped(m)); + ASSERT(!pmap_page_is_write_mapped(m)); ASSERT(db->db_size > PAGE_SIZE); bufoff = IDX_TO_OFF(m->pindex) % db->db_size;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103062025.126KPXxC074477>