Module Name: src
Committed By: mlelstv
Date: Mon Dec 29 18:23:57 UTC 2014
Modified Files:
src/sys/dev: cgd.c
Log Message:
use disk_ioctl to provide DIOCGDISKINFO.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 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.91 src/sys/dev/cgd.c:1.92
--- src/sys/dev/cgd.c:1.91 Thu Oct 2 21:01:38 2014
+++ src/sys/dev/cgd.c Mon Dec 29 18:23:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.91 2014/10/02 21:01:38 justin Exp $ */
+/* $NetBSD: cgd.c,v 1.92 2014/12/29 18:23:57 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.91 2014/10/02 21:01:38 justin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.92 2014/12/29 18:23:57 mlelstv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -548,6 +548,7 @@ cgdioctl(dev_t dev, u_long cmd, void *da
struct dk_softc *dksc;
int part = DISKPART(dev);
int pmask = 1 << part;
+ int error;
DPRINTF_FOLLOW(("cgdioctl(0x%"PRIx64", %ld, %p, %d, %p)\n",
dev, cmd, data, flag, l));
@@ -568,6 +569,10 @@ cgdioctl(dev_t dev, u_long cmd, void *da
break;
}
+ error = disk_ioctl(&dksc->sc_dkdev, cmd, data, flag, l);
+ if (error != EPASSTHROUGH)
+ return (error);
+
switch (cmd) {
case CGDIOCSET:
if (dksc->sc_flags & DKF_INITED)
