svn commit: r357285 - head/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Thu Jan 30 04:59:08 2020
New Revision: 357285
URL: https://svnweb.freebsd.org/changeset/base/357285

Log:
  vfs: assert that doomed vnodes don't need to call vm_object_page_clean
  
  ... after the optional inactive processing.

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Thu Jan 30 03:31:16 2020	(r357284)
+++ head/sys/kern/vfs_subr.c	Thu Jan 30 04:59:08 2020	(r357285)
@@ -3863,6 +3863,7 @@ vgonel(struct vnode *vp)
 		vinactivef(vp);
 		VI_UNLOCK(vp);
 	}
+	VNPASS(!vn_need_pageq_flush(vp), vp);
 	if (vp->v_type == VSOCK)
 		vfs_unp_reclaim(vp);
 
@@ -4994,7 +4995,7 @@ vn_need_pageq_flush(struct vnode *vp)
 	struct vm_object *obj;
 	int need;
 
-	MPASS(mtx_owned(VI_MTX(vp)));
+	VNPASS(VN_IS_DOOMED(vp) || mtx_owned(VI_MTX(vp)), vp);
 	need = 0;
 	if ((obj = vp->v_object) != NULL && (vp->v_vflag & VV_NOSYNC) == 0 &&
 	    vm_object_mightbedirty(obj))