CVS commit: src/sys/dev/dkwedge

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Mon Aug 22 00:19:33 UTC 2022

Modified Files:
        src/sys/dev/dkwedge: dk.c

Log Message:
dk(4): Factor common mutex_exit out of branches to keep it balanced.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 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.114 src/sys/dev/dkwedge/dk.c:1.115
--- src/sys/dev/dkwedge/dk.c:1.114	Mon Aug 22 00:19:22 2022
+++ src/sys/dev/dkwedge/dk.c	Mon Aug 22 00:19:33 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: dk.c,v 1.114 2022/08/22 00:19:22 riastradh Exp $	*/
+/*	$NetBSD: dk.c,v 1.115 2022/08/22 00:19:33 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.114 2022/08/22 00:19:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.115 2022/08/22 00:19:33 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -581,18 +581,16 @@ dkwedge_cleanup_parent(struct dkwedge_so
 
 	rc = 0;
 	mutex_enter(&dk->dk_openlock);
-	if (dk->dk_openmask == 0)
+	if (dk->dk_openmask == 0) {
 		/* nothing to do */
-		mutex_exit(&dk->dk_openlock);
-	else if ((flags & DETACH_FORCE) == 0) {
+	} else if ((flags & DETACH_FORCE) == 0) {
 		rc = EBUSY;
-		mutex_exit(&dk->dk_openlock);
 	}  else {
 		mutex_enter(&sc->sc_parent->dk_rawlock);
 		rc = dklastclose(sc);
 		mutex_exit(&sc->sc_parent->dk_rawlock);
-		mutex_exit(&sc->sc_dk.dk_openlock);
 	}
+	mutex_exit(&sc->sc_dk.dk_openlock);
 
 	return rc;
 }
@@ -1259,13 +1257,11 @@ dkclose(dev_t dev, int flags, int fmt, s
 
 	if (sc->sc_dk.dk_openmask == 0) {
 		error = dklastclose(sc);
-		mutex_exit(&sc->sc_parent->dk_rawlock);
-		mutex_exit(&sc->sc_dk.dk_openlock);
-	} else {
-		mutex_exit(&sc->sc_parent->dk_rawlock);
-		mutex_exit(&sc->sc_dk.dk_openlock);
 	}
 
+	mutex_exit(&sc->sc_parent->dk_rawlock);
+	mutex_exit(&sc->sc_dk.dk_openlock);
+
 	return (error);
 }