From dfd1f7fd50fffaf75541921fcf86454cd8eb3614 Mon Sep 17 00:00:00 2001 From: phk Date: Wed, 16 Jun 2004 09:47:26 +0000 Subject: Do the dreaded s/dev_t/struct cdev */ Bump __FreeBSD_version accordingly. --- sys/fs/coda/cnode.h | 6 +++--- sys/fs/coda/coda.h | 2 +- sys/fs/coda/coda_fbsd.c | 4 ++-- sys/fs/coda/coda_psdev.c | 12 ++++++------ sys/fs/coda/coda_psdev.h | 12 ++++++------ sys/fs/coda/coda_venus.c | 2 +- sys/fs/coda/coda_venus.h | 2 +- sys/fs/coda/coda_vfsops.c | 6 +++--- sys/fs/coda/coda_vnops.c | 4 ++-- sys/fs/coda/coda_vnops.h | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) (limited to 'sys/fs/coda') diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h index 540831c..be7e848 100644 --- a/sys/fs/coda/cnode.h +++ b/sys/fs/coda/cnode.h @@ -109,7 +109,7 @@ struct cnode { struct vattr c_vattr; /* attributes */ char *c_symlink; /* pointer to symbolic link */ u_short c_symlen; /* length of symbolic link */ - dev_t c_device; /* associated vnode device */ + struct cdev *c_device; /* associated vnode device */ ino_t c_inode; /* associated vnode inode */ struct cnode *c_next; /* links if on NetBSD machine */ }; @@ -153,7 +153,7 @@ struct coda_mntinfo { struct vnode *mi_rootvp; struct mount *mi_vfsp; struct vcomm mi_vcomm; - dev_t dev; + struct cdev *dev; int mi_started; }; extern struct coda_mntinfo coda_mnttbl[]; /* indexed by minor device number */ @@ -201,7 +201,7 @@ extern struct cnode *make_coda_node(CodaFid *fid, struct mount *vfsp, short type extern int coda_vnodeopstats_init(void); /* coda_vfsops.h */ -extern struct mount *devtomp(dev_t dev); +extern struct mount *devtomp(struct cdev *dev); /* sigh */ #define CODA_RDWR ((u_long) 31) diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h index e7f1e0d..90e7e2a 100644 --- a/sys/fs/coda/coda.h +++ b/sys/fs/coda/coda.h @@ -58,7 +58,7 @@ typedef unsigned long u_long; typedef unsigned int u_int; typedef unsigned short u_short; typedef u_long ino_t; -typedef u_long dev_t; +typedef u_long struct cdev *; typedef void * caddr_t; #ifdef DOS typedef unsigned __int64 u_quad_t; diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c index 784962c..0ce6e46 100644 --- a/sys/fs/coda/coda_fbsd.c +++ b/sys/fs/coda/coda_fbsd.c @@ -174,7 +174,7 @@ printf("error = %d\n", error); /* for DEVFS, using bpf & tun drivers as examples*/ static void coda_fbsd_drvinit(void *unused); static void coda_fbsd_drvuninit(void *unused); -static void coda_fbsd_clone(void *arg, char *name, int namelen, dev_t *dev); +static void coda_fbsd_clone(void *arg, char *name, int namelen, struct cdev **dev); static eventhandler_tag clonetag; @@ -182,7 +182,7 @@ static void coda_fbsd_clone(arg, name, namelen, dev) void *arg; char *name; int namelen; - dev_t *dev; + struct cdev **dev; { int u; diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c index 133d0fd..03e408d 100644 --- a/sys/fs/coda/coda_psdev.c +++ b/sys/fs/coda/coda_psdev.c @@ -117,7 +117,7 @@ vcodaattach(n) int vc_nb_open(dev, flag, mode, td) - dev_t dev; + struct cdev *dev; int flag; int mode; struct thread *td; /* NetBSD only */ @@ -149,7 +149,7 @@ vc_nb_open(dev, flag, mode, td) int vc_nb_close (dev, flag, mode, td) - dev_t dev; + struct cdev *dev; int flag; int mode; struct thread *td; @@ -233,7 +233,7 @@ vc_nb_close (dev, flag, mode, td) int vc_nb_read(dev, uiop, flag) - dev_t dev; + struct cdev *dev; struct uio *uiop; int flag; { @@ -287,7 +287,7 @@ vc_nb_read(dev, uiop, flag) int vc_nb_write(dev, uiop, flag) - dev_t dev; + struct cdev *dev; struct uio *uiop; int flag; { @@ -387,7 +387,7 @@ vc_nb_write(dev, uiop, flag) int vc_nb_ioctl(dev, cmd, addr, flag, td) - dev_t dev; + struct cdev *dev; u_long cmd; caddr_t addr; int flag; @@ -441,7 +441,7 @@ vc_nb_ioctl(dev, cmd, addr, flag, td) int vc_nb_poll(dev, events, td) - dev_t dev; + struct cdev *dev; int events; struct thread *td; { diff --git a/sys/fs/coda/coda_psdev.h b/sys/fs/coda/coda_psdev.h index c6ecf7f..f135b34 100644 --- a/sys/fs/coda/coda_psdev.h +++ b/sys/fs/coda/coda_psdev.h @@ -31,9 +31,9 @@ * */ -int vc_nb_open(dev_t dev, int flag, int mode, struct thread *p); -int vc_nb_close (dev_t dev, int flag, int mode, struct thread *p); -int vc_nb_read(dev_t dev, struct uio *uiop, int flag); -int vc_nb_write(dev_t dev, struct uio *uiop, int flag); -int vc_nb_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *p); -int vc_nb_poll(dev_t dev, int events, struct thread *p); +int vc_nb_open(struct cdev *dev, int flag, int mode, struct thread *p); +int vc_nb_close (struct cdev *dev, int flag, int mode, struct thread *p); +int vc_nb_read(struct cdev *dev, struct uio *uiop, int flag); +int vc_nb_write(struct cdev *dev, struct uio *uiop, int flag); +int vc_nb_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *p); +int vc_nb_poll(struct cdev *dev, int events, struct thread *p); diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c index 5105c0b..f0bc3c2 100644 --- a/sys/fs/coda/coda_venus.c +++ b/sys/fs/coda/coda_venus.c @@ -198,7 +198,7 @@ venus_root(void *mdp, int venus_open(void *mdp, CodaFid *fid, int flag, struct ucred *cred, struct proc *p, -/*out*/ dev_t *dev, ino_t *inode) +/*out*/ struct cdev **dev, ino_t *inode) { int cflag; DECL(coda_open); /* sets Isize & Osize */ diff --git a/sys/fs/coda/coda_venus.h b/sys/fs/coda/coda_venus.h index b506b5b..473b84d 100644 --- a/sys/fs/coda/coda_venus.h +++ b/sys/fs/coda/coda_venus.h @@ -39,7 +39,7 @@ venus_root(void *mdp, int venus_open(void *mdp, CodaFid *fid, int flag, struct ucred *cred, struct proc *p, -/*out*/ dev_t *dev, ino_t *inode); +/*out*/ struct cdev **dev, ino_t *inode); int venus_close(void *mdp, CodaFid *fid, int flag, diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index ff64429..e7290e7 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -81,7 +81,7 @@ struct coda_op_stats coda_vfsopstats[CODA_VFSOPS_SIZE]; #define MRAK_INT_GEN(op) (coda_vfsopstats[op].gen_intrn++) extern int coda_nc_initialized; /* Set if cache has been initialized */ -extern int vc_nb_open(dev_t, int, int, struct thread *); +extern int vc_nb_open(struct cdev *, int, int, struct thread *); int coda_vfsopstats_init(void) @@ -114,7 +114,7 @@ coda_mount(vfsp, path, data, ndp, td) { struct vnode *dvp; struct cnode *cp; - dev_t dev; + struct cdev *dev; struct coda_mntinfo *mi; struct vnode *rootvp; CodaFid rootfid = INVAL_FID; @@ -528,7 +528,7 @@ getNewVnode(vpp) * device corresponds to a UFS. Return NULL if no device is found. */ struct mount *devtomp(dev) - dev_t dev; + struct cdev *dev; { struct mount *mp; diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c index a1d24e9..a8666cc 100644 --- a/sys/fs/coda/coda_vnops.c +++ b/sys/fs/coda/coda_vnops.c @@ -238,7 +238,7 @@ coda_open(v) /* locals */ int error; struct vnode *vp; - dev_t dev; + struct cdev *dev; ino_t inode; MARK_ENTRY(CODA_OPEN_STATS); @@ -1806,7 +1806,7 @@ coda_islocked(v) /* How one looks up a vnode given a device/inode pair: */ int -coda_grab_vnode(dev_t dev, ino_t ino, struct vnode **vpp) +coda_grab_vnode(struct cdev *dev, ino_t ino, struct vnode **vpp) { /* This is like VFS_VGET() or igetinode()! */ int error; diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h index 8a3184b..88a398e 100644 --- a/sys/fs/coda/coda_vnops.h +++ b/sys/fs/coda/coda_vnops.h @@ -82,6 +82,6 @@ int coda_pathconf(void *); int coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw, int ioflag, struct ucred *cred, struct thread *td); -int coda_grab_vnode(dev_t dev, ino_t ino, struct vnode **vpp); +int coda_grab_vnode(struct cdev *dev, ino_t ino, struct vnode **vpp); void print_vattr(struct vattr *attr); void print_cred(struct ucred *cred); -- cgit v1.1