svn commit: r358719 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Konstantin Belousov
kib at FreeBSD.org
Fri Mar 6 21:15:26 UTC 2020
Author: kib
Date: Fri Mar 6 21:15:25 2020
New Revision: 358719
URL: https://svnweb.freebsd.org/changeset/base/358719
Log:
zfs dmu_read: loosen the assertion.
Since switch to the lockless grab, shared busy for ahead/behind pages
allows other threads to validate and map the pages readonly.
Reviewed by: avg, jeff, markj
Sponsored by: The FreeBSD Foundation
Differential revision: https://reviews.freebsd.org/D23986
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Fri Mar 6 20:44:22 2020 (r358718)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Fri Mar 6 21:15:25 2020 (r358719)
@@ -1752,7 +1752,7 @@ dmu_read_pages(objset_t *os, uint64_t object, vm_page_
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;
@@ -1867,7 +1867,7 @@ dmu_read_pages(objset_t *os, uint64_t object, vm_page_
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;
More information about the svn-src-all
mailing list