d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't restrict device drivers ability to sleep in the ioctl method, this

Browse Source 
is actually entirely legal.

Do bio's with ioctls in them in a g_call_me() function.

Sponsored by:	DARPA & NAI Labs
This commit is contained in:
Poul-Henning Kamp 2002-10-01 18:42:32 +00:00
parent 0c96d7c634
commit 2fcf0b5c37
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/geom/geom_disk.c
View File

@ -125,6 +125,26 @@ g_disk_done(struct bio *bp)
mtx_lock(&Giant);
}
static void
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
g_disk_start(struct bio *bp)
{
@ -165,11 +185,8 @@ g_disk_start(struct bio *bp)
g_disk_kerneldump(bp, dp);
else if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
bp->bio_length == sizeof *gio) {
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_call_me(g_disk_ioctl, bp);
return;
} else
error = ENOIOCTL;
break;