35c35
< * $FreeBSD: head/sys/geom/geom_disk.c 104542 2002-10-05 21:55:31Z phk $
---
> * $FreeBSD: head/sys/geom/geom_disk.c 104602 2002-10-07 06:25:26Z phk $
135,154d134
< g_disk_ioctl(void *arg)
< {
< struct bio *bp;
< dev_t dev;
< struct disk *dp;
< struct g_ioctl *gio;
< int error;
<
< bp = arg;
< dp = bp->bio_to->geom->softc;
< dev = dp->d_dev;
< gio = (struct g_ioctl *)bp->bio_data;
< mtx_lock(&Giant);
< error = devsw(dev)->d_ioctl(dev, gio->cmd,
< gio->data, gio->fflag, gio->td);
< mtx_unlock(&Giant);
< g_io_deliver(bp, error);
< }
<
< static void
194,195c174,177
< g_call_me(g_disk_ioctl, bp);
< return;
---
> gio = (struct g_ioctl *)bp->bio_data;
> gio->func = devsw(dp->d_dev)->d_ioctl;
> gio->dev = dp->d_dev;
> error = EDIRIOCTL;
202,203c184,187
< g_call_me(g_disk_ioctl, bp);
< return;
---
> gio = (struct g_ioctl *)bp->bio_data;
> gio->func = devsw(dp->d_dev)->d_ioctl;
> gio->dev = dp->d_dev;
> error = EDIRIOCTL;