Module Name: src
Committed By: riastradh
Date: Mon Aug 22 00:31:57 UTC 2022
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
Revert "dk(4): Narrow scope of dk_rawlock on close to dklastclose."
dkfirstopen relies on reading from dk_openmask of _other_ wedges,
writes to dk_openmask must be serialized by dk_rawlock in addition to
dk_openlock. (However, reads from dk_openlock only require one or
the other).
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/dkwedge/dk.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/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.121 src/sys/dev/dkwedge/dk.c:1.122
--- src/sys/dev/dkwedge/dk.c:1.121 Mon Aug 22 00:20:36 2022
+++ src/sys/dev/dkwedge/dk.c Mon Aug 22 00:31:57 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.121 2022/08/22 00:20:36 riastradh Exp $ */
+/* $NetBSD: dk.c,v 1.122 2022/08/22 00:31:57 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.121 2022/08/22 00:20:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.122 2022/08/22 00:31:57 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -1253,6 +1253,7 @@ dkclose(dev_t dev, int flags, int fmt, s
KASSERT(sc->sc_dk.dk_openmask != 0);
mutex_enter(&sc->sc_dk.dk_openlock);
+ mutex_enter(&sc->sc_parent->dk_rawlock);
if (fmt == S_IFCHR)
sc->sc_dk.dk_copenmask &= ~1;
@@ -1262,11 +1263,10 @@ dkclose(dev_t dev, int flags, int fmt, s
sc->sc_dk.dk_copenmask | sc->sc_dk.dk_bopenmask;
if (sc->sc_dk.dk_openmask == 0) {
- mutex_enter(&sc->sc_parent->dk_rawlock);
dklastclose(sc);
- mutex_exit(&sc->sc_parent->dk_rawlock);
}
+ mutex_exit(&sc->sc_parent->dk_rawlock);
mutex_exit(&sc->sc_dk.dk_openlock);
return 0;
