diff options
Diffstat (limited to 'sys/isofs')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_extern.h | 4 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/isofs/cd9660/cd9660_extern.h b/sys/isofs/cd9660/cd9660_extern.h index 546e24e43e2..7c57a3cb23e 100644 --- a/sys/isofs/cd9660/cd9660_extern.h +++ b/sys/isofs/cd9660/cd9660_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_extern.h,v 1.5 2000/06/07 23:25:08 millert Exp $ */ +/* $OpenBSD: cd9660_extern.h,v 1.6 2001/02/20 01:50:08 assar Exp $ */ /* $NetBSD: cd9660_extern.h,v 1.1 1997/01/24 00:24:53 cgd Exp $ */ /*- @@ -84,7 +84,7 @@ struct iso_mnt { #define lblkno(imp, loc) ((loc) >> (imp)->im_bshift) #define blksize(imp, ip, lbn) ((imp)->logical_block_size) -int cd9660_mount __P((struct mount *, const char *, caddr_t, +int cd9660_mount __P((struct mount *, const char *, void *, struct nameidata *, struct proc *)); int cd9660_start __P((struct mount *, int, struct proc *)); int cd9660_unmount __P((struct mount *, int, struct proc *)); diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index ac08b189ca2..4b8f8dcd8fa 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vfsops.c,v 1.20 2000/06/07 23:25:08 millert Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.21 2001/02/20 01:50:09 assar Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -134,7 +134,7 @@ int cd9660_mount(mp, path, data, ndp, p) register struct mount *mp; const char *path; - caddr_t data; + void *data; struct nameidata *ndp; struct proc *p; { @@ -144,7 +144,7 @@ cd9660_mount(mp, path, data, ndp, p) int error; struct iso_mnt *imp = NULL; - error = copyin(data, (caddr_t)&args, sizeof (struct iso_args)); + error = copyin(data, &args, sizeof (struct iso_args)); if (error) return (error); |