Module Name: src
Committed By: riastradh
Date: Mon Aug 22 00:19:43 UTC 2022
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
dk(4): Narrow scope of dk_rawlock on close to dklastclose.
No need to take it if we're not actually going to close the parent.
No functional change intended; dk_rawlock is only supposed to
serialize dk_rawopens access and open/close of the parent, after all.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 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.115 src/sys/dev/dkwedge/dk.c:1.116
--- src/sys/dev/dkwedge/dk.c:1.115 Mon Aug 22 00:19:33 2022
+++ src/sys/dev/dkwedge/dk.c Mon Aug 22 00:19:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.115 2022/08/22 00:19:33 riastradh Exp $ */
+/* $NetBSD: dk.c,v 1.116 2022/08/22 00:19:43 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.115 2022/08/22 00:19:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.116 2022/08/22 00:19:43 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -1246,7 +1246,6 @@ 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;
@@ -1256,10 +1255,11 @@ 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);
error = dklastclose(sc);
+ mutex_exit(&sc->sc_parent->dk_rawlock);
}
- mutex_exit(&sc->sc_parent->dk_rawlock);
mutex_exit(&sc->sc_dk.dk_openlock);
return (error);
