From 331fee623ed306c6720ed39edfbc5ef1d8514ce9 Mon Sep 17 00:00:00 2001
From: ross <ross@NetBSD.org>
Date: Sun, 1 Mar 1998 07:15:39 +0000
Subject: [PATCH] Sweep up some miscellaneous leftover lite2 integration
 shrapnel.

---
 sys/dev/ccd.c          | 10 +++++-----
 sys/lib/libsa/ufs.c    |  4 ++--
 sys/nfs/nfs_bootdhcp.c |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 3128fce805e3..38a9c3f5bb9d 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -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.
@@ -1376,7 +1376,7 @@ ccdlookup(path, p, vpp)
 	vp = nd.ni_vp;
 
 	if (vp->v_usecount > 1) {
-		VOP_UNLOCK(vp);
+		VOP_UNLOCK(vp, 0);
 		(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
 		return (EBUSY);
 	}
@@ -1386,14 +1386,14 @@ ccdlookup(path, p, vpp)
 		if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 			printf("ccdlookup: getattr error = %d\n", error);
 #endif
-		VOP_UNLOCK(vp);
+		VOP_UNLOCK(vp, 0);
 		(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
 		return (error);
 	}
 
 	/* XXX: eventually we should handle VREG, too. */
 	if (va.va_type != VBLK) {
-		VOP_UNLOCK(vp);
+		VOP_UNLOCK(vp, 0);
 		(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
 		return (ENOTBLK);
 	}
@@ -1403,7 +1403,7 @@ ccdlookup(path, p, vpp)
 		vprint("ccdlookup: vnode info", vp);
 #endif
 
-	VOP_UNLOCK(vp);
+	VOP_UNLOCK(vp, 0);
 	*vpp = vp;
 	return (0);
 }
diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c
index 6890c66ce281..cf881cf62fe6 100644
--- a/sys/lib/libsa/ufs.c
+++ b/sys/lib/libsa/ufs.c
@@ -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
@@ -68,9 +68,9 @@
 
 #include <sys/param.h>
 #include <sys/time.h>
-#include <ufs/ffs/fs.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
 #ifdef _STANDALONE
 #include <lib/libkern/libkern.h>
 #else
diff --git a/sys/nfs/nfs_bootdhcp.c b/sys/nfs/nfs_bootdhcp.c
index 7d0da5006544..ace0bea109f4 100644
--- a/sys/nfs/nfs_bootdhcp.c
+++ b/sys/nfs/nfs_bootdhcp.c
@@ -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.
@@ -75,8 +75,11 @@
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 
+#include <nfs/rpcv2.h>
+
 #include <nfs/nfsproto.h>
-/* #include <nfs/nfs.h> */
+#include <nfs/nfs.h>
+#include <nfs/nfsmount.h>
 #include <nfs/nfsdiskless.h>
 
 /*