[src/trunk]: src/sys/kern Do not clean up segvguard while holding v_interlock.c

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac66f98b21a9
branches:  trunk
changeset: 1006693:ac66f98b21a9
user:      ad <ad%NetBSD.org@localhost>
date:      Thu Jan 23 20:53:33 2020 +0000

description:
Do not clean up segvguard while holding v_interlock.c

diffstat:

 sys/kern/vfs_vnode.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 885a1fbd9d84 -r ac66f98b21a9 sys/kern/vfs_vnode.c
--- a/sys/kern/vfs_vnode.c      Thu Jan 23 20:44:15 2020 +0000
+++ b/sys/kern/vfs_vnode.c      Thu Jan 23 20:53:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_vnode.c,v 1.109 2020/01/23 11:17:09 ad Exp $       */
+/*     $NetBSD: vfs_vnode.c,v 1.110 2020/01/23 20:53:33 ad Exp $       */
 
 /*-
  * Copyright (c) 1997-2011, 2019 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.109 2020/01/23 11:17:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.110 2020/01/23 20:53:33 ad Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pax.h"
@@ -1677,13 +1677,13 @@
        vfs_ref(dead_rootmount);
        vfs_insmntque(vp, dead_rootmount);
 
+#ifdef PAX_SEGVGUARD
+       pax_segvguard_cleanup(vp);
+#endif /* PAX_SEGVGUARD */
+
        mutex_enter(vp->v_interlock);
        fstrans_done(mp);
        KASSERT((vp->v_iflag & VI_ONWORKLST) == 0);
-
-#ifdef PAX_SEGVGUARD
-       pax_segvguard_cleanup(vp);
-#endif /* PAX_SEGVGUARD */
 }
 
 /*