Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sweep up some miscellaneous leftover lite2 integration shrapnel.

Browse Source
This commit is contained in:
ross 1998-03-01 07:15:39 +00:00
parent c6b14e94ad
commit 331fee623e
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ccd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ccd.c,v 1.48 1998/02/22 07:14:30 enami Exp $ */ /* $NetBSD: ccd.c,v 1.49 1998/03/01 07:15:39 ross Exp $ */
/*- /*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -1376,7 +1376,7 @@ ccdlookup(path, p, vpp)
vp = nd.ni_vp; vp = nd.ni_vp;
if (vp->v_usecount > 1) { if (vp->v_usecount > 1) {
VOP_UNLOCK(vp); VOP_UNLOCK(vp, 0);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p); (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (EBUSY); return (EBUSY);
} }
@ -1386,14 +1386,14 @@ ccdlookup(path, p, vpp)
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT)) if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
printf("ccdlookup: getattr error = %d\n", error); printf("ccdlookup: getattr error = %d\n", error);
#endif #endif
VOP_UNLOCK(vp); VOP_UNLOCK(vp, 0);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p); (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (error); return (error);
} }
/* XXX: eventually we should handle VREG, too. */ /* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) { if (va.va_type != VBLK) {
VOP_UNLOCK(vp); VOP_UNLOCK(vp, 0);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p); (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (ENOTBLK); return (ENOTBLK);
} }
@ -1403,7 +1403,7 @@ ccdlookup(path, p, vpp)
vprint("ccdlookup: vnode info", vp); vprint("ccdlookup: vnode info", vp);
#endif #endif
VOP_UNLOCK(vp); VOP_UNLOCK(vp, 0);
*vpp = vp; *vpp = vp;
return (0); return (0);
} }

4
sys/lib/libsa/ufs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs.c,v 1.19 1997/06/26 19:11:55 drochner Exp $ */ /* $NetBSD: ufs.c,v 1.20 1998/03/01 07:15:39 ross Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -68,9 +68,9 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/time.h> #include <sys/time.h>
#include <ufs/ffs/fs.h>
#include <ufs/ufs/dinode.h> #include <ufs/ufs/dinode.h>
#include <ufs/ufs/dir.h> #include <ufs/ufs/dir.h>
#include <ufs/ffs/fs.h>
#ifdef _STANDALONE #ifdef _STANDALONE
#include <lib/libkern/libkern.h> #include <lib/libkern/libkern.h>
#else #else

7
sys/nfs/nfs_bootdhcp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_bootdhcp.c,v 1.5 1998/01/12 21:27:14 scottr Exp $ */ /* $NetBSD: nfs_bootdhcp.c,v 1.6 1998/03/01 07:15:40 ross Exp $ */
/*- /*-
* Copyright (c) 1995, 1997 The NetBSD Foundation, Inc. * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@ -75,8 +75,11 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/if_inarp.h> #include <netinet/if_inarp.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h> #include <nfs/nfsproto.h>
/* #include <nfs/nfs.h> */ #include <nfs/nfs.h>
#include <nfs/nfsmount.h>
#include <nfs/nfsdiskless.h> #include <nfs/nfsdiskless.h>
/* /*