Module Name: src
Committed By: mlelstv
Date: Sat Nov 28 21:06:31 UTC 2015
Modified Files:
src/sys/dev: cgd.c
Log Message:
Remove bogus dk_getdisklabel call.
- there is no need to read the label in the attach routine
- passing a (dev_t)0 may cause havoc.
This fixes PR 41704.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/cgd.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/cgd.c
diff -u src/sys/dev/cgd.c:1.105 src/sys/dev/cgd.c:1.106
--- src/sys/dev/cgd.c:1.105 Sat Nov 28 14:45:24 2015
+++ src/sys/dev/cgd.c Sat Nov 28 21:06:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.105 2015/11/28 14:45:24 mlelstv Exp $ */
+/* $NetBSD: cgd.c,v 1.106 2015/11/28 21:06:30 mlelstv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.105 2015/11/28 14:45:24 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.106 2015/11/28 21:06:30 mlelstv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -711,9 +711,6 @@ cgd_ioctl_set(struct cgd_softc *cs, void
disk_set_info(dksc->sc_dev, &dksc->sc_dkdev, NULL);
- /* Try and read the disklabel. */
- dk_getdisklabel(dksc, 0 /* XXX ? (cause of PR 41704) */);
-
/* Discover wedges on this disk. */
dkwedge_discover(&dksc->sc_dkdev);
