diff options
| author | phk <phk@FreeBSD.org> | 2004-12-12 10:09:05 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-12 10:09:05 +0000 |
| commit | 35b3c9fdfbd8e466654ebad62b044a7d3c01f3b7 (patch) | |
| tree | c331a8f51b025987771bf29e5baf7455e29185d9 /sys/dev/ata/atapi-cd.c | |
| parent | cfac934dde18f8d08432e5509b2dd827eb77be2c (diff) | |
| download | FreeBSD-src-35b3c9fdfbd8e466654ebad62b044a7d3c01f3b7.zip FreeBSD-src-35b3c9fdfbd8e466654ebad62b044a7d3c01f3b7.tar.gz | |
Pass the file->flags down to geom ioctl handlers.
Reject certain ioctls if write permission is not indicated.
Bump geom API version.
Reported by: Ruben de Groot <mail25@bzerk.org>
Diffstat (limited to 'sys/dev/ata/atapi-cd.c')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 6c36f99..9b86948 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -63,7 +63,7 @@ static void acd_describe(struct acd_softc *); static void lba2msf(u_int32_t, u_int8_t *, u_int8_t *, u_int8_t *); static u_int32_t msf2lba(u_int8_t, u_int8_t, u_int8_t); static int acd_geom_access(struct g_provider *, int, int, int); -static int acd_geom_ioctl(struct g_provider *, u_long, void *, struct thread *); +static g_ioctl_t acd_geom_ioctl; static void acd_geom_start(struct bio *); static void acd_done(struct ata_request *); static void acd_read_toc(struct acd_softc *); @@ -550,7 +550,7 @@ acd_geom_access(struct g_provider *pp, int dr, int dw, int de) } static int -acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, struct thread *td) +acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, int fflag, struct thread *td) { struct acd_softc *cdp = pp->geom->softc; int error = 0; |
