Module Name: src Committed By: riastradh Date: Tue Apr 11 14:50:47 UTC 2023
Modified Files: src/sys/ufs/lfs: lfs_pages.c Log Message: lfs: Assert page identity doesn't change. Forgot what I was debugging when I inserted a relookup in my local tree months or years ago, but whatever it was, if that solved a problem, this KDASSERT will make the problem more obvious. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/ufs/lfs/lfs_pages.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/ufs/lfs/lfs_pages.c diff -u src/sys/ufs/lfs/lfs_pages.c:1.26 src/sys/ufs/lfs/lfs_pages.c:1.27 --- src/sys/ufs/lfs/lfs_pages.c:1.26 Sat Sep 5 16:30:13 2020 +++ src/sys/ufs/lfs/lfs_pages.c Tue Apr 11 14:50:47 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_pages.c,v 1.26 2020/09/05 16:30:13 riastradh Exp $ */ +/* $NetBSD: lfs_pages.c,v 1.27 2023/04/11 14:50:47 riastradh Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2019 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.26 2020/09/05 16:30:13 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.27 2023/04/11 14:50:47 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -499,6 +499,9 @@ retry: while (pg->flags & PG_BUSY) { uvm_pagewait(pg, vp->v_uobj.vmobjlock, "lfsput2"); rw_enter(vp->v_uobj.vmobjlock, RW_WRITER); + /* XXX Page can't change identity here? */ + KDASSERT(pg == + uvm_pagelookup(&vp->v_uobj, off)); } uvm_pagelock(pg); uvm_pageactivate(pg);