diff options
Diffstat (limited to 'sys/coda/coda_fbsd.c')
| -rw-r--r-- | sys/coda/coda_fbsd.c | 120 |
1 files changed, 42 insertions, 78 deletions
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c index 23d55cc..f137ff5 100644 --- a/sys/coda/coda_fbsd.c +++ b/sys/coda/coda_fbsd.c @@ -1,54 +1,57 @@ /* - - Coda: an Experimental Distributed File System - Release 3.1 - - Copyright (c) 1987-1998 Carnegie Mellon University - All Rights Reserved - -Permission to use, copy, modify and distribute this software and its -documentation is hereby granted, provided that both the copyright -notice and this permission notice appear in all copies of the -software, derivative works or modified versions, and any portions -thereof, and that both notices appear in supporting documentation, and -that credit is given to Carnegie Mellon University in all documents -and publicity pertaining to direct or indirect use of this code or its -derivatives. - -CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS KNOWN TO HAVE BUGS, -SOME OF WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON ALLOWS -FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION. CARNEGIE MELLON -DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER -RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE OR OF -ANY DERIVATIVE WORK. - -Carnegie Mellon encourages users of this software to return any -improvements or extensions that they make, and to grant Carnegie -Mellon the rights to redistribute these changes without encumbrance. -*/ - -/* $Header: /afs/cs/project/coda-src/cvs/coda/kernel-src/vfs/freebsd/cfs/cfs_fbsd.c,v 1.6 1998/08/28 18:12:11 rvb Exp $ */ + * + * Coda: an Experimental Distributed File System + * Release 3.1 + * + * Copyright (c) 1987-1998 Carnegie Mellon University + * All Rights Reserved + * + * Permission to use, copy, modify and distribute this software and its + * documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation, and + * that credit is given to Carnegie Mellon University in all documents + * and publicity pertaining to direct or indirect use of this code or its + * derivatives. + * + * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS KNOWN TO HAVE BUGS, + * SOME OF WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON ALLOWS + * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION. CARNEGIE MELLON + * DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER + * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE OR OF + * ANY DERIVATIVE WORK. + * + * Carnegie Mellon encourages users of this software to return any + * improvements or extensions that they make, and to grant Carnegie + * Mellon the rights to redistribute these changes without encumbrance. + * + * @(#) src/sys/cfs/cfs_fbsd.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ + * $Id: $ + * + */ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> +#include <sys/malloc.h> #include <sys/fcntl.h> #include <sys/ucred.h> -#include <sys/malloc.h> +#include <sys/vnode.h> +#include <sys/conf.h> + #include <vm/vm.h> #include <vm/vnode_pager.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif -#include <sys/conf.h> - -#include <sys/vnode.h> #include <cfs/coda.h> #include <cfs/cnode.h> #include <cfs/cfs_vnodeops.h> +#ifdef DEVFS +#include <sys/devfsext.h> +#endif + /* From: "Jordan K. Hubbard" <jkh@time.cdrom.com> Subject: Re: New 3.0 SNAPshot CDROM about ready for production.. @@ -63,7 +66,6 @@ Mellon the rights to redistribute these changes without encumbrance. #define VC_DEV_NO 93 -#ifdef __FreeBSD_version /* Type of device methods. */ extern d_open_t vc_nb_open; extern d_close_t vc_nb_close; @@ -76,33 +78,8 @@ static struct cdevsw vccdevsw = { vc_nb_open, vc_nb_close, vc_nb_read, vc_nb_write, /*93*/ vc_nb_ioctl, nostop, nullreset, nodevtotty, - vc_nb_poll, nommap, NULL, "Coda", NULL, -1 }; -#else -/* Type of device methods. */ -#define D_OPEN_T d_open_t -#define D_CLOSE_T d_close_t -#define D_RDWR_T d_rdwr_t -#define D_READ_T d_read_t -#define D_WRITE_T d_write_t -#define D_IOCTL_T d_ioctl_t -#define D_SELECT_T d_select_t - -/* rvb why */ -D_OPEN_T vc_nb_open; /* was is defined in cfs_FreeBSD.h */ -D_CLOSE_T vc_nb_close; -D_READ_T vc_nb_read; -D_WRITE_T vc_nb_write; -D_IOCTL_T vc_nb_ioctl; -D_SELECT_T vc_nb_select; - -static struct cdevsw vccdevsw = -{ - vc_nb_open, vc_nb_close, vc_nb_read, vc_nb_write, - vc_nb_ioctl, nostop, nullreset, nodevtotty, - vc_nb_select, nommap, NULL, "Coda", NULL, -1 }; - -PSEUDO_SET(vcattach, vc); -#endif + vc_nb_poll, nommap, NULL, "Coda", NULL, -1 +}; void vcattach __P((void)); static dev_t vccdev; @@ -125,21 +102,9 @@ vcattach(void) VCDEBUG("cfs: vccdevsw entry installed at %d.\n", major(vccdev)); } -void -cvref(vp) - struct vnode *vp; -{ - if (vp->v_usecount <= 0) - panic("vref used where vget required"); - - vp->v_usecount++; -} - - -#ifdef __FreeBSD_version static vc_devsw_installed = 0; - static void vc_drvinit __P((void *unused)); + static void vc_drvinit(void *unused) { @@ -238,4 +203,3 @@ cfs_fbsd_putpages(v) SYSINIT(vccdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+VC_DEV_NO,vc_drvinit,NULL) -#endif |
