Module Name: src
Committed By: martin
Date: Tue Feb 11 08:37:34 UTC 2020
Modified Files:
src/sys/dev [netbsd-9]: ld.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #694):
sys/dev/ld.c: revision 1.108
Reject open when attach didn't complete successfully.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.106.4.1 src/sys/dev/ld.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/ld.c
diff -u src/sys/dev/ld.c:1.106 src/sys/dev/ld.c:1.106.4.1
--- src/sys/dev/ld.c:1.106 Tue Mar 19 07:01:14 2019
+++ src/sys/dev/ld.c Tue Feb 11 08:37:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.106 2019/03/19 07:01:14 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.106.4.1 2020/02/11 08:37:34 martin Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.106 2019/03/19 07:01:14 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.106.4.1 2020/02/11 08:37:34 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,6 +290,10 @@ ldopen(dev_t dev, int flags, int fmt, st
unit = DISKUNIT(dev);
if ((sc = device_lookup_private(&ld_cd, unit)) == NULL)
return (ENXIO);
+
+ if ((sc->sc_flags & LDF_ENABLED) == 0)
+ return (ENODEV);
+
dksc = &sc->sc_dksc;
return dk_open(dksc, dev, flags, fmt, l);
