Module Name: src
Committed By: mlelstv
Date: Sat Jul 11 09:45:16 UTC 2015
Modified Files:
src/sys/dev: dksubr.c
Log Message:
Mark disklabel only invalid on the last close. Existing openers might see
temporarily invalid data while it is re-read.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.63 src/sys/dev/dksubr.c:1.64
--- src/sys/dev/dksubr.c:1.63 Sat May 9 13:07:20 2015
+++ src/sys/dev/dksubr.c Sat Jul 11 09:45:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.63 2015/05/09 13:07:20 christos Exp $ */
+/* $NetBSD: dksubr.c,v 1.64 2015/07/11 09:45:16 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.63 2015/05/09 13:07:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.64 2015/07/11 09:45:16 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -194,11 +194,10 @@ dk_close(struct dk_softc *dksc, dev_t de
if (dk->dk_openmask == 0) {
if (dkd->d_lastclose != NULL)
(*dkd->d_lastclose)(dksc->sc_dev);
+ if ((dksc->sc_flags & DKF_KLABEL) == 0)
+ dksc->sc_flags &= ~DKF_VLABEL;
}
- if ((dksc->sc_flags & DKF_KLABEL) == 0)
- dksc->sc_flags &= ~DKF_VLABEL;
-
mutex_exit(&dk->dk_openlock);
return 0;
}
