[src/trunk]: src/sys/dev/dkwedge dk(4): Assert about dk_openmask under the lock.

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

details:   https://anonhg.NetBSD.org/src/rev/930f33a30939
branches:  trunk
changeset: 369579:930f33a30939
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 22 00:32:30 2022 +0000

description:
dk(4): Assert about dk_openmask under the lock.

This serves two purposes:

1. Pacifies data race sanitizers.

2. Ensures that we don't spuriously trip over the assertion if
   dkclose happens concurrently with dkopen due to a revoke call.

diffstat:

 sys/dev/dkwedge/dk.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 774b35bf4602 -r 930f33a30939 sys/dev/dkwedge/dk.c
--- a/sys/dev/dkwedge/dk.c      Mon Aug 22 00:31:57 2022 +0000
+++ b/sys/dev/dkwedge/dk.c      Mon Aug 22 00:32:30 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dk.c,v 1.122 2022/08/22 00:31:57 riastradh Exp $       */
+/*     $NetBSD: dk.c,v 1.123 2022/08/22 00:32:30 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.122 2022/08/22 00:31:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.123 2022/08/22 00:32:30 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -1250,11 +1250,11 @@
        if (sc->sc_state != DKW_STATE_RUNNING)
                return ENXIO;
 
-       KASSERT(sc->sc_dk.dk_openmask != 0);
-
        mutex_enter(&sc->sc_dk.dk_openlock);
        mutex_enter(&sc->sc_parent->dk_rawlock);
 
+       KASSERT(sc->sc_dk.dk_openmask != 0);
+
        if (fmt == S_IFCHR)
                sc->sc_dk.dk_copenmask &= ~1;
        else