diff options
author | phk <phk@FreeBSD.org> | 1998-10-25 17:44:59 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1998-10-25 17:44:59 +0000 |
commit | 13c66194f4b66073c693cdb830b5091d9d735e17 (patch) | |
tree | 6fad3c4a8f13b0ab244bebf9795bb095be5ee8d7 /sys/kern | |
parent | b17bde009a29901e8647e3d0c680a716f3526a2d (diff) | |
download | FreeBSD-src-13c66194f4b66073c693cdb830b5091d9d735e17.zip FreeBSD-src-13c66194f4b66073c693cdb830b5091d9d735e17.tar.gz |
Nitpicking and dusting performed on a train. Removes trivial warnings
about unused variables, labels and other lint.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/imgact_elf.c | 6 | ||||
-rw-r--r-- | sys/kern/kern_clock.c | 5 | ||||
-rw-r--r-- | sys/kern/kern_conf.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_lkm.c | 9 | ||||
-rw-r--r-- | sys/kern/kern_malloc.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_physio.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_synch.c | 7 | ||||
-rw-r--r-- | sys/kern/kern_tc.c | 5 | ||||
-rw-r--r-- | sys/kern/kern_threads.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_time.c | 3 | ||||
-rw-r--r-- | sys/kern/link_aout.c | 3 | ||||
-rw-r--r-- | sys/kern/link_elf.c | 13 | ||||
-rw-r--r-- | sys/kern/link_elf_obj.c | 13 | ||||
-rw-r--r-- | sys/kern/subr_bus.c | 8 | ||||
-rw-r--r-- | sys/kern/uipc_usrreq.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_aio.c | 7 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 26 | ||||
-rw-r--r-- | sys/kern/vfs_cluster.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_export.c | 18 | ||||
-rw-r--r-- | sys/kern/vfs_init.c | 14 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 18 |
21 files changed, 43 insertions, 134 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index e049b52..0989b03 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_elf.c,v 1.40 1998/10/16 03:55:00 peter Exp $ + * $Id: imgact_elf.c,v 1.41 1998/10/18 15:55:12 peter Exp $ */ #include "opt_rlimit.h" @@ -397,7 +397,7 @@ static int exec_elf_imgact(struct image_params *imgp) { const Elf_Ehdr *hdr = (const Elf_Ehdr *) imgp->image_header; - const Elf_Phdr *phdr, *mapped_phdr = NULL; + const Elf_Phdr *phdr; Elf_Auxargs *elf_auxargs = NULL; struct vmspace *vmspace; vm_prot_t prot; @@ -649,7 +649,6 @@ elf_coredump(p) { register struct vnode *vp; register struct ucred *cred = p->p_cred->pc_ucred; - register struct vmspace *vm = p->p_vmspace; struct nameidata nd; struct vattr vattr; int error, error1; @@ -843,7 +842,6 @@ elf_corehdr(p, vp, cred, numsegs, hdr, hdrsize) size_t hdrsize; void *hdr; { - struct vmspace *vm = p->p_vmspace; size_t off; prstatus_t status; prfpregset_t fpregset; diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 300288a..c2163a4 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.80 1998/10/06 23:17:44 alex Exp $ + * $Id: kern_clock.c,v 1.81 1998/10/23 10:44:52 phk Exp $ */ #include <sys/param.h> @@ -357,7 +357,6 @@ statclock(frame) register struct gmonparam *g; #endif register struct proc *p; - register int i; struct pstats *pstats; long rss; struct rusage *ru; @@ -663,7 +662,7 @@ tco_setscales(struct timecounter *tc) void init_timecounter(struct timecounter *tc) { - struct timespec ts0, ts1; + struct timespec ts1; struct timecounter *t1, *t2, *t3; int i; diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 684b365..d1925bf 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_conf.c,v 1.26 1998/06/26 18:14:25 phk Exp $ + * $Id: kern_conf.c,v 1.27 1998/07/04 22:30:21 julian Exp $ */ #include <sys/param.h> @@ -57,7 +57,6 @@ int nchrdev = NUMCDEV; dev_t chrtoblk(dev_t dev) { - struct bdevsw *bd; struct cdevsw *cd; if(cd = cdevsw[major(dev)]) { diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index f7ca01d..5882ba9 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_lkm.c,v 1.56 1998/09/07 05:42:15 bde Exp $ + * $Id: kern_lkm.c,v 1.57 1998/10/16 03:55:00 peter Exp $ */ #include "opt_devfs.h" @@ -250,7 +250,7 @@ lkmcioctl(dev, cmd, data, flag, p) #ifdef DEBUG printf("LKM: LMRESERV (actual = 0x%08lx)\n", curp->area); - printf("LKM: LMRESERV (adjusted = 0x%08x)\n", + printf("LKM: LMRESERV (adjusted = 0x%08lx)\n", trunc_page(curp->area)); #endif /* DEBUG */ lkm_state = LKMS_RESERVED; @@ -828,10 +828,7 @@ _lkm_exec(lkmtp, cmd) int cmd; { struct lkm_exec *args = lkmtp->private.lkm_exec; - int i; int err = 0; - const struct execsw **execsw = - (const struct execsw **)&execsw_set.ls_items[0]; switch(cmd) { case LKM_E_LOAD: @@ -846,7 +843,7 @@ _lkm_exec(lkmtp, cmd) err = exec_register(args->lkm_exec); /* done! */ - args->lkm_offset = 0; /* slot in execsw[] */ + args->lkm_offset = 0; break; diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 618b726..3de5e17 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.46 1998/07/29 17:38:14 bde Exp $ + * $Id: kern_malloc.c,v 1.47 1998/08/16 01:21:51 bde Exp $ */ #include "opt_vm.h" @@ -436,8 +436,6 @@ static void malloc_init(type) struct malloc_type *type; { - int npg; - int mem_size; if (type->ks_magic != M_MAGIC) panic("malloc type lacks magic"); diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 17bd5b2..441d95f 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: kern_physio.c,v 1.27 1998/07/04 22:30:21 julian Exp $ + * $Id: kern_physio.c,v 1.28 1998/08/19 10:50:32 sos Exp $ */ #include <sys/param.h> @@ -169,7 +169,6 @@ minphys(bp) { u_int maxphys = DFLTPHYS; struct cdevsw *bdsw; - int offset; bdsw = cdevsw[major(bp->b_dev)]; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 2d51055..22046a6 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $Id: kern_synch.c,v 1.61 1998/07/15 02:32:10 bde Exp $ + * $Id: kern_synch.c,v 1.62 1998/08/26 05:27:42 dillon Exp $ */ #include "opt_ktrace.h" @@ -138,7 +138,6 @@ static void roundrobin(arg) void *arg; { - struct proc *p = curproc; /* XXX */ #ifdef SMP need_resched(); @@ -223,8 +222,8 @@ roundrobin(arg) static fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, ""); -/* kernel uses `FSCALE', user uses `fscale' */ -static int fscale = FSCALE; +/* kernel uses `FSCALE', userland (SHOULD) use kern.fscale */ +static int fscale __unused = FSCALE; SYSCTL_INT(_kern, OID_AUTO, fscale, CTLFLAG_RD, 0, FSCALE, ""); /* diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 300288a..c2163a4 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.80 1998/10/06 23:17:44 alex Exp $ + * $Id: kern_clock.c,v 1.81 1998/10/23 10:44:52 phk Exp $ */ #include <sys/param.h> @@ -357,7 +357,6 @@ statclock(frame) register struct gmonparam *g; #endif register struct proc *p; - register int i; struct pstats *pstats; long rss; struct rusage *ru; @@ -663,7 +662,7 @@ tco_setscales(struct timecounter *tc) void init_timecounter(struct timecounter *tc) { - struct timespec ts0, ts1; + struct timespec ts1; struct timecounter *t1, *t2, *t3; int i; diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c index 1121f09..e2c245e 100644 --- a/sys/kern/kern_threads.c +++ b/sys/kern/kern_threads.c @@ -46,7 +46,7 @@ * in Germany will I accept domestic beer. This code may or may not work * and I certainly make no claims as to its fitness for *any* purpose. * - * $Id: kern_threads.c,v 1.7 1998/03/30 09:50:18 phk Exp $ + * $Id: kern_threads.c,v 1.8 1998/06/02 05:39:11 dyson Exp $ */ #include <sys/param.h> @@ -71,7 +71,7 @@ thr_sleep(struct proc *p, struct thr_sleep_args *uap) { int sleepstart; struct timespec ts; struct timeval atv; - int error, s, timo; + int error, timo; timo = 0; if (uap->timeout != 0) { diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index c269355..2bd17bb 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $Id: kern_time.c,v 1.57 1998/05/17 20:13:01 bde Exp $ + * $Id: kern_time.c,v 1.58 1998/06/09 13:10:53 phk Exp $ */ #include <sys/param.h> @@ -79,7 +79,6 @@ settime(tv) { struct timeval delta, tv1; struct timespec ts; - struct proc *p; int s; s = splclock(); diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c index 80e9e1f..7113a95 100644 --- a/sys/kern/link_aout.c +++ b/sys/kern/link_aout.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: link_aout.c,v 1.13 1998/10/09 23:49:28 peter Exp $ + * $Id: link_aout.c,v 1.14 1998/10/16 03:45:35 peter Exp $ */ #ifndef __alpha__ @@ -561,7 +561,6 @@ link_aout_search_symbol(linker_file_t lf, caddr_t value, struct nzlist* sp; struct nzlist* ep; struct nzlist* best = 0; - int i; for (sp = AOUT_RELOC(af, struct nzlist, LD_SYMBOL(af->dynamic)), ep = (struct nzlist *) ((caddr_t) sp + LD_STABSZ(af->dynamic)); diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 26b6213..b1a4193 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: link_elf.c,v 1.6 1998/10/15 17:16:24 peter Exp $ + * $Id: link_elf.c,v 1.7 1998/10/16 03:55:00 peter Exp $ */ #include <sys/param.h> @@ -416,17 +416,6 @@ link_elf_load_file(const char* filename, linker_file_t* result) Elf_Off base_offset; Elf_Addr base_vaddr; Elf_Addr base_vlimit; - caddr_t base_addr; - Elf_Off data_offset; - Elf_Addr data_vaddr; - Elf_Addr data_vlimit; - caddr_t data_addr; - Elf_Addr clear_vaddr; - caddr_t clear_addr; - size_t nclear; - Elf_Addr bss_vaddr; - Elf_Addr bss_vlimit; - caddr_t bss_addr; int error = 0; int resid; elf_file_t ef; diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 26b6213..b1a4193 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: link_elf.c,v 1.6 1998/10/15 17:16:24 peter Exp $ + * $Id: link_elf.c,v 1.7 1998/10/16 03:55:00 peter Exp $ */ #include <sys/param.h> @@ -416,17 +416,6 @@ link_elf_load_file(const char* filename, linker_file_t* result) Elf_Off base_offset; Elf_Addr base_vaddr; Elf_Addr base_vlimit; - caddr_t base_addr; - Elf_Off data_offset; - Elf_Addr data_vaddr; - Elf_Addr data_vlimit; - caddr_t data_addr; - Elf_Addr clear_vaddr; - caddr_t clear_addr; - size_t nclear; - Elf_Addr bss_vaddr; - Elf_Addr bss_vlimit; - caddr_t bss_addr; int error = 0; int resid; elf_file_t ef; diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index f38f0f8..3e10586 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: subr_bus.c,v 1.5 1998/09/05 13:24:39 bde Exp $ + * $Id: subr_bus.c,v 1.6 1998/10/03 08:55:29 dfr Exp $ */ #include <sys/param.h> @@ -258,7 +258,6 @@ devclass_get_devices(devclass_t dc, device_t **devlistp, int *devcountp) { int i; int count; - device_t dev; device_t *list; count = 0; @@ -366,7 +365,6 @@ static device_t make_device(device_t parent, const char *name, int unit, void *ivars) { - driver_t *driver; device_t dev; devclass_t dc; int error; @@ -515,7 +513,6 @@ device_probe_child(device_t dev, device_t child) { devclass_t dc; driver_t *driver; - void *softc; dc = dev->devclass; if (dc == NULL) @@ -878,7 +875,6 @@ int bus_generic_attach(device_t dev) { device_t child; - int error; for (child = TAILQ_FIRST(&dev->children); child; child = TAILQ_NEXT(child, link)) @@ -891,7 +887,6 @@ int bus_generic_detach(device_t dev) { device_t child; - int error; if (dev->state != DS_ATTACHED) return EBUSY; @@ -1011,7 +1006,6 @@ void root_bus_configure() { device_t dev; - int error; for (dev = TAILQ_FIRST(&root_bus->children); dev; dev = TAILQ_NEXT(dev, link)) { diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 0799791..93f6164 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.35 1998/05/15 20:11:31 wollman Exp $ + * $Id: uipc_usrreq.c,v 1.36 1998/07/15 02:32:12 bde Exp $ */ #include <sys/param.h> @@ -709,7 +709,7 @@ unp_abort(unp) static int unp_pcblist SYSCTL_HANDLER_ARGS { - int error, i, n, s; + int error, i, n; struct unpcb *unp, **unp_list; unp_gen_t gencnt; struct xunpgen xug; diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 89e5a58..ffa6912 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -13,7 +13,7 @@ * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. * - * $Id: vfs_aio.c,v 1.32 1998/07/15 06:51:14 bde Exp $ + * $Id: vfs_aio.c,v 1.33 1998/08/17 17:28:10 bde Exp $ */ /* @@ -953,7 +953,6 @@ aio_qphysio(p, aiocbe) struct aiocblist *aiocbe; { int error; - caddr_t sa; struct aiocb *cb; struct file *fp; struct buf *bp; @@ -1388,11 +1387,10 @@ int aio_return(struct proc *p, struct aio_return_args *uap) { int s; - int jobref, status; + int jobref; struct aiocblist *cb, *ncb; struct aiocb *ujob; struct kaioinfo *ki; - struct proc *userp; ki = p->p_aioinfo; if (ki == NULL) { @@ -1583,7 +1581,6 @@ aio_error(struct proc *p, struct aio_error_args *uap) struct aiocblist *cb; struct kaioinfo *ki; int jobref; - int error, status; ki = p->p_aioinfo; if (ki == NULL) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 0fc7770..8084f3d 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $Id: vfs_bio.c,v 1.178 1998/09/26 00:12:35 dillon Exp $ + * $Id: vfs_bio.c,v 1.179 1998/10/13 08:24:40 dg Exp $ */ /* @@ -68,7 +68,6 @@ SYSINIT_KT(update, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &up_kp) struct buf *buf; /* buffer header pool */ struct swqueue bswlist; -static int count_lock_queue __P((void)); static void vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to); static void vm_hold_load_pages(struct buf * bp, vm_offset_t from, @@ -444,7 +443,6 @@ vfs_bio_need_satisfy(void) { void bdwrite(struct buf * bp) { - int s; struct vnode *vp; #if !defined(MAX_PERF) @@ -519,7 +517,6 @@ void bdirty(bp) struct buf *bp; { - int s; bp->b_flags &= ~(B_READ|B_RELBUF); /* XXX ??? check this */ if ((bp->b_flags & B_DELWRI) == 0) { @@ -1401,7 +1398,6 @@ getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo) int i, s; struct bufhashhdr *bh; int maxsize; - int generation; int checksize; if (vp->v_mount) { @@ -1427,7 +1423,6 @@ loop: } if ((bp = gbincore(vp, blkno))) { -loop1: if (bp->b_flags & B_BUSY) { bp->b_flags |= B_WANTED; @@ -2054,20 +2049,6 @@ biodone(register struct buf * bp) splx(s); } -static int -count_lock_queue() -{ - int count; - struct buf *bp; - - count = 0; - for (bp = TAILQ_FIRST(&bufqueues[QUEUE_LOCKED]); - bp != NULL; - bp = TAILQ_NEXT(bp, b_freelist)) - count++; - return (count); -} - #if 0 /* not with kirks code */ static int vfs_update_interval = 30; @@ -2106,7 +2087,7 @@ SYSCTL_PROC(_kern, KERN_UPDATEINTERVAL, update, CTLTYPE_INT|CTLFLAG_RW, void vfs_unbusy_pages(struct buf * bp) { - int i, s; + int i; if (bp->b_flags & B_VMIO) { struct vnode *vp = bp->b_vp; @@ -2223,7 +2204,7 @@ vfs_page_set_valid(struct buf *bp, vm_ooffset_t off, int pageno, vm_page_t m) void vfs_busy_pages(struct buf * bp, int clear_modify) { - int i, s; + int i; if (bp->b_flags & B_VMIO) { struct vnode *vp = bp->b_vp; @@ -2278,7 +2259,6 @@ vfs_clean_pages(struct buf * bp) int i; if (bp->b_flags & B_VMIO) { - struct vnode *vp = bp->b_vp; vm_ooffset_t foff; foff = bp->b_offset; diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index fb88938..c7f7f32 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.69 1998/08/24 08:39:39 dfr Exp $ + * $Id: vfs_cluster.c,v 1.70 1998/09/04 08:06:55 dfr Exp $ */ #include "opt_debug_cluster.h" @@ -309,7 +309,7 @@ cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp) { struct buf *bp, *tbp; daddr_t bn; - int i, inc, j, s; + int i, inc, j; #ifdef DIAGNOSTIC if (size != vp->v_mount->mnt_stat.f_iosize) diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index c0117a6..aa9f754 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.166 1998/10/14 15:05:52 dt Exp $ + * $Id: vfs_subr.c,v 1.167 1998/10/25 16:11:49 bde Exp $ */ /* @@ -76,9 +76,6 @@ static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); static void insmntque __P((struct vnode *vp, struct mount *mp)); -#ifdef DDB -static void printlockedvnodes __P((void)); -#endif static void vclean __P((struct vnode *vp, int flags, struct proc *p)); static void vfree __P((struct vnode *)); static void vgonel __P((struct vnode *vp, struct proc *p)); @@ -708,9 +705,8 @@ vtruncbuf(vp, cred, p, length, blksize) int blksize; { register struct buf *bp; - struct buf *nbp, *blist; - int s, error, anyfreed; - vm_object_t object; + struct buf *nbp; + int s, anyfreed; int trunclbn; /* @@ -1950,12 +1946,12 @@ vprint(label, vp) } #ifdef DDB +#include <ddb/ddb.h> /* * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -static void -printlockedvnodes() +DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) { struct proc *p = curproc; /* XXX */ struct mount *mp, *nmp; @@ -2059,8 +2055,6 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS #endif /* 1 || COMPAT_PRELITE2 */ -static volatile int kinfo_vdebug = 1; - #if 0 #define KINFO_VNODESLOP 10 /* @@ -2102,8 +2096,6 @@ again: */ if (vp->v_mount != mp) { simple_unlock(&mntvnode_slock); - if (kinfo_vdebug) - printf("kinfo: vp changed\n"); goto again; } nvp = vp->v_mntvnodes.le_next; diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 147c4fd..2160675 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $Id: vfs_init.c,v 1.35 1998/10/16 03:55:00 peter Exp $ + * $Id: vfs_init.c,v 1.36 1998/10/25 10:52:34 bde Exp $ */ @@ -65,13 +65,6 @@ MALLOC_DEFINE(M_VNODE, "vnodes", "Dynamically allocated vnodes"); #define DODEBUG(A) #endif -static struct vfsconf void_vfsconf; - -#ifdef unused -extern struct linker_set vfs_opv_descs_; -#define vfs_opv_descs ((struct vnodeopv_desc **)vfs_opv_descs_.ls_items) -#endif - extern struct vnodeop_desc *vfs_op_descs[]; /* and the operations they perform */ @@ -243,8 +236,6 @@ static void vfsinit(dummy) void *dummy; { - struct vfsconf **vfc, *vfsp; - int maxtypenum; namei_zone = zinit("NAMEI", MAXPATHLEN, 0, 0, 2); @@ -275,7 +266,7 @@ vfs_register(vfc) struct linker_set *l; struct sysctl_oid **oidpp; struct vfsconf *vfsp; - int error, i, maxtypenum, exists; + int i, exists; vfsp = NULL; l = &sysctl__vfs; @@ -336,7 +327,6 @@ void vfs_mod_opv_init(handle) void *handle; { - int i; struct vnodeopv_desc *opv; opv = (struct vnodeopv_desc *)handle; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c0117a6..aa9f754 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.166 1998/10/14 15:05:52 dt Exp $ + * $Id: vfs_subr.c,v 1.167 1998/10/25 16:11:49 bde Exp $ */ /* @@ -76,9 +76,6 @@ static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); static void insmntque __P((struct vnode *vp, struct mount *mp)); -#ifdef DDB -static void printlockedvnodes __P((void)); -#endif static void vclean __P((struct vnode *vp, int flags, struct proc *p)); static void vfree __P((struct vnode *)); static void vgonel __P((struct vnode *vp, struct proc *p)); @@ -708,9 +705,8 @@ vtruncbuf(vp, cred, p, length, blksize) int blksize; { register struct buf *bp; - struct buf *nbp, *blist; - int s, error, anyfreed; - vm_object_t object; + struct buf *nbp; + int s, anyfreed; int trunclbn; /* @@ -1950,12 +1946,12 @@ vprint(label, vp) } #ifdef DDB +#include <ddb/ddb.h> /* * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -static void -printlockedvnodes() +DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) { struct proc *p = curproc; /* XXX */ struct mount *mp, *nmp; @@ -2059,8 +2055,6 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS #endif /* 1 || COMPAT_PRELITE2 */ -static volatile int kinfo_vdebug = 1; - #if 0 #define KINFO_VNODESLOP 10 /* @@ -2102,8 +2096,6 @@ again: */ if (vp->v_mount != mp) { simple_unlock(&mntvnode_slock); - if (kinfo_vdebug) - printf("kinfo: vp changed\n"); goto again; } nvp = vp->v_mntvnodes.le_next; |