From 35b3c9fdfbd8e466654ebad62b044a7d3c01f3b7 Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 12 Dec 2004 10:09:05 +0000 Subject: 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 --- sys/dev/ata/atapi-cd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/ata/atapi-cd.c') 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; -- cgit v1.1