git: b8ae329db949 - releng/13.0 - Restore dirty dnode detection logic
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 20 Mar 2022 14:11:26 UTC
The branch releng/13.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b8ae329db949868b8275091da0844ffbff50c65a commit b8ae329db949868b8275091da0844ffbff50c65a Author: Brian Behlendorf <behlendorf1@llnl.gov> AuthorDate: 2021-11-11 00:14:32 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-03-20 14:10:36 +0000 Restore dirty dnode detection logic In addition to flushing memory mapped regions when checking holes, commit de198f2d95 modified the dirty dnode detection logic to check the dn->dn_dirty_records instead of the dn->dn_dirty_link. Relying on the dirty record has not be reliable, switch back to the previous method. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #11900 Closes #12745 (cherry picked from commit d7e640cf95f72deeca501d34afed59a0bc9d7940) Approved by: so Security: FreeBSD-EN-22:13.zfs --- sys/contrib/openzfs/module/zfs/dnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 8592c5f8c3a9..b69ba68ec780 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1661,7 +1661,7 @@ dnode_is_dirty(dnode_t *dn) mutex_enter(&dn->dn_mtx); for (int i = 0; i < TXG_SIZE; i++) { - if (list_head(&dn->dn_dirty_records[i]) != NULL) { + if (multilist_link_active(&dn->dn_dirty_link[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); }