d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nitpicking and dusting performed on a train. Removes trivial warnings

Browse Source 
about unused variables, labels and other lint.
This commit is contained in:
Poul-Henning Kamp 1998-10-25 17:44:59 +00:00
parent 37906c686d
commit f5ef029e92
31 changed files with 64 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/coda/coda_vnops.c
View File

@ -27,7 +27,7 @@
* Mellon the rights to redistribute these changes without encumbrance.
*
* @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
* $Id: coda_vnops.c,v 1.5 1998/09/25 17:38:32 rvb Exp $
* $Id: coda_vnops.c,v 1.6 1998/09/28 20:52:58 rvb Exp $
*
*/
@ -48,6 +48,9 @@
/*
* HISTORY
* $Log: coda_vnops.c,v $
* Revision 1.6 1998/09/28 20:52:58 rvb
* Cleanup and fix THE bug
*
* Revision 1.5 1998/09/25 17:38:32 rvb
* Put "stray" printouts under DIAGNOSTIC. Make everything build
* with DEBUG on. Add support for lkm. (The macro's don't work
@ -1512,8 +1515,6 @@ coda_link(v)
CODADEBUG(CODA_LINK, myprintf(("in link result %d\n",error)); )
exit:
/* Drop the name buffer if we don't need to SAVESTART */
if ((cnp->cn_flags & SAVESTART) == 0) {
zfree(namei_zone, cnp->cn_pnbuf);

7
sys/fs/coda/coda_vnops.c
View File

@ -27,7 +27,7 @@
* Mellon the rights to redistribute these changes without encumbrance.
*
* @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
* $Id: coda_vnops.c,v 1.5 1998/09/25 17:38:32 rvb Exp $
* $Id: coda_vnops.c,v 1.6 1998/09/28 20:52:58 rvb Exp $
*
*/
@ -48,6 +48,9 @@
/*
* HISTORY
* $Log: coda_vnops.c,v $
* Revision 1.6 1998/09/28 20:52:58 rvb
* Cleanup and fix THE bug
*
* Revision 1.5 1998/09/25 17:38:32 rvb
* Put "stray" printouts under DIAGNOSTIC. Make everything build
* with DEBUG on. Add support for lkm. (The macro's don't work
@ -1512,8 +1515,6 @@ coda_link(v)
CODADEBUG(CODA_LINK, myprintf(("in link result %d\n",error)); )
exit:
/* Drop the name buffer if we don't need to SAVESTART */
if ((cnp->cn_flags & SAVESTART) == 0) {
zfree(namei_zone, cnp->cn_pnbuf);

6
sys/kern/imgact_elf.c
View File

@ -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;

5
sys/kern/kern_clock.c
View File

@ -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;

3
sys/kern/kern_conf.c
View File

@ -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)]) {

9
sys/kern/kern_lkm.c
View File

@ -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;

4
sys/kern/kern_malloc.c
View File

@ -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");

3
sys/kern/kern_physio.c
View File

@ -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)];

7
sys/kern/kern_synch.c
View File

@ -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, "");
/*

5
sys/kern/kern_tc.c
View File

@ -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;

4
sys/kern/kern_threads.c
View File

@ -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) {

3
sys/kern/kern_time.c
View File

@ -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();

3
sys/kern/link_aout.c
View File

@ -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));

13
sys/kern/link_elf.c
View File

@ -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;

13
sys/kern/link_elf_obj.c
View File

@ -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;

8
sys/kern/subr_bus.c
View File

@ -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)) {

4
sys/kern/uipc_usrreq.c
View File

@ -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;

7
sys/kern/vfs_aio.c
View File

@ -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)

26
sys/kern/vfs_bio.c
View File

@ -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 @@ getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo)
}
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;

4
sys/kern/vfs_cluster.c
View File

@ -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)

18
sys/kern/vfs_export.c
View File

@ -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 @@ sysctl_vnode SYSCTL_HANDLER_ARGS
*/
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;

14
sys/kern/vfs_init.c
View File

@ -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;

18
sys/kern/vfs_subr.c
View File

@ -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 @@ sysctl_vnode SYSCTL_HANDLER_ARGS
*/
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;

4
sys/netnatm/natm.c
View File

@ -144,7 +144,6 @@ natm_usr_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
struct natmpcb *npcb;
struct sockaddr_natm *snatm;
struct atm_pseudoioctl api;
struct atm_pseudohdr *aph;
struct ifnet *ifp;
int error = 0;
int s2, s = SPLSOFTNET();
@ -226,13 +225,10 @@ static int
natm_usr_disconnect(struct socket *so)
{
struct natmpcb *npcb;
struct sockaddr_natm *snatm;
struct atm_pseudoioctl api;
struct atm_pseudohdr *aph;
struct ifnet *ifp;
int error = 0;
int s2, s = SPLSOFTNET();
int proto = so->so_proto->pr_protocol;
npcb = (struct natmpcb *) so->so_pcb;
if (npcb == NULL) {

4
sys/ufs/ffs/ffs_inode.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95
* $Id: ffs_inode.c,v 1.46 1998/07/04 20:45:38 julian Exp $
* $Id: ffs_inode.c,v 1.47 1998/09/15 14:45:28 luoqi Exp $
*/
#include "opt_quota.h"
@ -144,7 +144,7 @@ ffs_truncate(vp, length, flags, cred, p)
register struct fs *fs;
struct buf *bp;
int offset, size, level;
long count, nblocks, vflags, blocksreleased = 0;
long count, nblocks, blocksreleased = 0;
struct timeval tv;
register int i;
int aflags, error, allerror;

6
sys/ufs/ffs/ffs_vfsops.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95
* $Id: ffs_vfsops.c,v 1.87 1998/09/14 19:56:41 sos Exp $
* $Id: ffs_vfsops.c,v 1.88 1998/09/26 04:59:42 bde Exp $
*/
#include "opt_quota.h"
@ -576,12 +576,10 @@ ffs_mountfs(devvp, mp, p, malloctype)
register struct ufsmount *ump;
struct buf *bp;
register struct fs *fs;
struct cg *cgp;
dev_t dev;
struct partinfo dpart;
struct csum cstotal;
caddr_t base, space;
int error, i, cyl, blks, size, ronly;
int error, i, blks, size, ronly;
int32_t *lp;
struct ucred *cred;
u_int64_t maxfilesize; /* XXX */

3
sys/vm/vm_fault.c
View File

@ -66,7 +66,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_fault.c,v 1.87 1998/08/24 08:39:37 dfr Exp $
* $Id: vm_fault.c,v 1.88 1998/09/04 08:06:57 dfr Exp $
*/
/*
@ -183,7 +183,6 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, int fault_flags)
vm_page_t marray[VM_FAULT_READ];
int hardfault;
int faultcount;
struct proc *p = curproc; /* XXX */
struct faultstate fs;
cnt.v_vm_faults++; /* needs lock XXX */

12
sys/vm/vm_map.c
View File

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_map.c,v 1.136 1998/10/01 20:46:41 jdp Exp $
* $Id: vm_map.c,v 1.137 1998/10/13 08:24:43 dg Exp $
*/
/*
@ -92,8 +92,6 @@
#include <vm/swap_pager.h>
#include <vm/vm_zone.h>
static MALLOC_DEFINE(M_VMMAP, "VM map", "VM map structures");
/*
* Virtual memory maps provide for the mapping, protection,
* and sharing of virtual memory objects. In addition,
@ -2754,9 +2752,9 @@ vm_freeze_copyopts(object, froma, toa)
vm_object_t object;
vm_pindex_t froma, toa;
{
int s, rv;
vm_object_t robject, robjectn;
vm_pindex_t idx, from, to;
int rv;
vm_object_t robject;
vm_pindex_t idx;
if ((object == NULL) ||
((object->flags & OBJ_OPT) == 0))
@ -2784,12 +2782,10 @@ vm_freeze_copyopts(object, froma, toa)
for (idx = 0; idx < robject->size; idx++) {
m_outretry:
m_out = vm_page_grab(robject, idx,
VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
if (m_out->valid == 0) {
m_inretry:
m_in = vm_page_grab(object, bo_pindex + idx,
VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
if (m_in->valid == 0) {

7
sys/vm/vm_object.c
View File

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_object.c,v 1.131 1998/10/23 05:25:49 dg Exp $
* $Id: vm_object.c,v 1.132 1998/10/23 05:43:13 dg Exp $
*/
/*
@ -294,7 +294,6 @@ void
vm_object_deallocate(object)
vm_object_t object;
{
int s;
vm_object_t temp;
while (object != NULL) {
@ -520,7 +519,6 @@ vm_object_page_clean(object, start, end, flags)
vm_page_t mab[vm_pageout_page_count];
vm_page_t ma[vm_pageout_page_count];
int curgeneration;
struct proc *pproc = curproc; /* XXX */
if (object->type != OBJT_VNODE ||
(object->flags & OBJ_MIGHTBEDIRTY) == 0)
@ -776,7 +774,6 @@ vm_object_madvise(object, pindex, count, advise)
int count;
int advise;
{
int s;
vm_pindex_t end, tpindex;
vm_object_t tobject;
vm_page_t m;
@ -1298,7 +1295,7 @@ vm_object_page_remove(object, start, end, clean_only)
{
register vm_page_t p, next;
unsigned int size;
int s, all;
int all;
if (object == NULL)
return;

6
sys/vm/vm_page.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91
* $Id: vm_page.c,v 1.108 1998/10/21 11:43:04 dg Exp $
* $Id: vm_page.c,v 1.109 1998/10/21 14:46:41 dg Exp $
*/
/*
@ -500,7 +500,6 @@ vm_page_lookup(object, pindex)
register vm_page_t m;
register struct pglist *bucket;
int generation;
int s;
/*
* Search the hash table for this object/offset pair
@ -1001,7 +1000,6 @@ vm_wait()
int
vm_page_sleep(vm_page_t m, char *msg, char *busy) {
vm_object_t object = m->object;
int slept = 0;
if ((busy && *busy) || (m->flags & PG_BUSY)) {
int s;
@ -1028,8 +1026,6 @@ vm_page_activate(m)
register vm_page_t m;
{
int s;
vm_page_t np;
vm_object_t object;
s = splvm();
if (m->queue != PQ_ACTIVE) {

4
sys/vm/vm_pageout.c
View File

@ -65,7 +65,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_pageout.c,v 1.126 1998/09/04 08:06:57 dfr Exp $
* $Id: vm_pageout.c,v 1.127 1998/09/29 17:33:59 abial Exp $
*/
/*
@ -1221,7 +1221,6 @@ vm_pageout()
* The pageout daemon is never done, so loop forever.
*/
while (TRUE) {
int inactive_target;
int error;
int s = splvm();
if (!vm_pages_needed ||
@ -1275,7 +1274,6 @@ vm_req_vmdaemon()
static void
vm_daemon()
{
vm_object_t object;
struct proc *p;
while (TRUE) {