From 4a331aac448bc6ebd006fa2ea80af68f57c666eb Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 31 Dec 2014 19:52:04 +0000 Subject: make more drivers use disk_ioctl, and add a dev parameter to it so that we can merge the "easy" disklabel ioctls to it. Ultimately all this will go do dk_ioctl once all the drivers have been converted. --- sys/dev/mscp/mscp_disk.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) (limited to 'sys/dev/mscp') diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c index 88c8456e12e..038c42cee25 100644 --- a/sys/dev/mscp/mscp_disk.c +++ b/sys/dev/mscp/mscp_disk.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp_disk.c,v 1.83 2014/12/31 17:06:48 christos Exp $ */ +/* $NetBSD: mscp_disk.c,v 1.84 2014/12/31 19:52:05 christos Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.83 2014/12/31 17:06:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.84 2014/12/31 19:52:05 christos Exp $"); #include #include @@ -412,32 +412,13 @@ raioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) lp = ra->ra_disk.dk_label; - error = disk_ioctl(&ra->ra_disk, cmd, data, flag, l); + error = disk_ioctl(&ra->ra_disk, dev, cmd, data, flag, l); if (error != EPASSTHROUGH) return error; else error = 0; switch (cmd) { - - case DIOCGDINFO: - memcpy(data, lp, sizeof (struct disklabel)); - break; -#ifdef __HAVE_OLD_DISKLABEL - case ODIOCGDINFO: - memcpy(&newlabel, lp, sizeof newlabel); - if (newlabel.d_npartitions > OLDMAXPARTITIONS) - return ENOTTY; - memcpy(data, &newlabel, sizeof (struct olddisklabel)); - break; -#endif - - case DIOCGPART: - ((struct partinfo *)data)->disklab = lp; - ((struct partinfo *)data)->part = - &lp->d_partitions[DISKPART(dev)]; - break; - case DIOCWDINFO: case DIOCSDINFO: #ifdef __HAVE_OLD_DISKLABEL @@ -877,25 +858,13 @@ rxioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) lp = rx->ra_disk.dk_label; - error = disk_ioctl(&rx->ra_disk, cmd, data, flag, l); + error = disk_ioctl(&rx->ra_disk, dev, cmd, data, flag, l); if (error != EPASSTHROUGH) return error; else error = 0; switch (cmd) { - - case DIOCGDINFO: - memcpy(data, lp, sizeof (struct disklabel)); - break; - - case DIOCGPART: - ((struct partinfo *)data)->disklab = lp; - ((struct partinfo *)data)->part = - &lp->d_partitions[DISKPART(dev)]; - break; - - case DIOCWDINFO: case DIOCSDINFO: case DIOCWLABEL: -- cgit