Module Name: src
Committed By: mlelstv
Date: Mon Apr 6 12:02:08 UTC 2015
Modified Files:
src/sys/dev: vnd.c
Log Message:
Make DIOCKLABEL work. Set default to keep the disklabel after close to
not change current behaviour.
To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.241 src/sys/dev/vnd.c:1.242
--- src/sys/dev/vnd.c:1.241 Wed Jan 28 16:27:43 2015
+++ src/sys/dev/vnd.c Mon Apr 6 12:02:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.241 2015/01/28 16:27:43 bouyer Exp $ */
+/* $NetBSD: vnd.c,v 1.242 2015/04/06 12:02:08 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.241 2015/01/28 16:27:43 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.242 2015/04/06 12:02:08 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -332,6 +332,9 @@ vndopen(dev_t dev, int flags, int mode,
sc = vnd_spawn(unit);
if (sc == NULL)
return ENOMEM;
+
+ /* compatibility, keep disklabel after close */
+ sc->sc_flags = VNF_KLABEL;
}
if ((error = vndlock(sc)) != 0)
@@ -434,6 +437,12 @@ vndclose(dev_t dev, int flags, int mode,
sc->sc_dkdev.dk_openmask =
sc->sc_dkdev.dk_copenmask | sc->sc_dkdev.dk_bopenmask;
+ /* are we last opener ? */
+ if (sc->sc_dkdev.dk_openmask == 0) {
+ if ((sc->sc_flags & VNF_KLABEL) == 0)
+ sc->sc_flags &= ~VNF_VLABEL;
+ }
+
vndunlock(sc);
if ((sc->sc_flags & VNF_INITED) == 0) {
@@ -1696,7 +1705,7 @@ vndclear(struct vnd_softc *vnd, int mymi
}
#endif /* VND_COMPRESSION */
vnd->sc_flags &=
- ~(VNF_INITED | VNF_READONLY | VNF_VLABEL
+ ~(VNF_INITED | VNF_READONLY | VNF_KLABEL | VNF_VLABEL
| VNF_VUNCONF | VNF_COMP | VNF_CLEARING);
if (vp == NULL)
panic("vndclear: null vp");
