CVS commit: src/sys/dev/dkwedge

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Wed Jun  2 17:56:41 UTC 2021

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

Log Message:
Clear sc_mode only on last close.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 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.104 src/sys/dev/dkwedge/dk.c:1.105
--- src/sys/dev/dkwedge/dk.c:1.104	Wed Jun  2 15:59:08 2021
+++ src/sys/dev/dkwedge/dk.c	Wed Jun  2 17:56:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dk.c,v 1.104 2021/06/02 15:59:08 mlelstv Exp $	*/
+/*	$NetBSD: dk.c,v 1.105 2021/06/02 17:56:40 mlelstv 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.104 2021/06/02 15:59:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.105 2021/06/02 17:56:40 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -1221,6 +1221,7 @@ dklastclose(struct dkwedge_softc *sc)
 			KASSERT(sc->sc_parent->dk_rawvp != NULL);
 			vp = sc->sc_parent->dk_rawvp;
 			sc->sc_parent->dk_rawvp = NULL;
+			sc->sc_mode = 0;
 		}
 	}
 
@@ -1264,9 +1265,7 @@ dkclose(dev_t dev, int flags, int fmt, s
 
 	if (sc->sc_dk.dk_openmask == 0) {
 		error = dklastclose(sc); /* releases locks */
-		sc->sc_mode = 0;
 	} else {
-		sc->sc_mode = 0;
 		mutex_exit(&sc->sc_parent->dk_rawlock);
 		mutex_exit(&sc->sc_dk.dk_openlock);
 	}