diff options
| author | christos <christos@NetBSD.org> | 2014-12-31 19:52:04 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2014-12-31 19:52:04 +0000 |
| commit | 4a331aac448bc6ebd006fa2ea80af68f57c666eb (patch) | |
| tree | a61e69370e02aa55f74db2134eb4c32a0ce55868 /sys/dev/dkwedge | |
| parent | 7e0dbe4aff861a57f08f15f13b40808d8bd26a6f (diff) | |
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.
Diffstat (limited to 'sys/dev/dkwedge')
| -rw-r--r-- | sys/dev/dkwedge/dk.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c index 30908654b14..33bccfe8e29 100644 --- a/sys/dev/dkwedge/dk.c +++ b/sys/dev/dkwedge/dk.c @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.77 2014/12/31 08:24:50 mlelstv Exp $ */ +/* $NetBSD: dk.c,v 1.78 2014/12/31 19:52:05 christos Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.77 2014/12/31 08:24:50 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.78 2014/12/31 19:52:05 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_dkwedge.h" @@ -1358,7 +1358,11 @@ dkioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) if (sc->sc_parent->dk_rawvp == NULL) return (ENXIO); - error = disk_ioctl(&sc->sc_dk, cmd, data, flag, l); + /* + * We pass 0 instead of our device to indicate we don't + * want to handle disklabel ioctls + */ + error = disk_ioctl(&sc->sc_dk, 0, cmd, data, flag, l); if (error != EPASSTHROUGH) return (error); |
