Fix include stuff, unused variables and statics and other small things needed

to compile in our tree.

6 files changed, 7 insertions, 6 deletions

diff --git a/sys/xfs/xfs_message.c b/sys/xfs/xfs_message.c
index f8f9d05ab49..d9dfaffa187 100644
--- a/sys/xfs/xfs_message.c
+++ b/sys/xfs/xfs_message.c
@@ -357,7 +357,6 @@ xfs_message_updatefid(int fd,
 		      d_thread_t *p)
 {
     int error = 0;
-    struct xfs_node *t;
 
     NNPFSDEB(XDEBMSG, ("xfs_message_updatefid (%d,%d,%d,%d) (%d,%d,%d,%d)\n",
 		       message->old_handle.a,
diff --git a/sys/xfs/xfs_node-bsd.c b/sys/xfs/xfs_node-bsd.c
index b74b1169d05..1be56c51b5c 100644
--- a/sys/xfs/xfs_node-bsd.c
+++ b/sys/xfs/xfs_node-bsd.c
@@ -55,7 +55,6 @@ xfs_getnewvnode(struct xfs *xfsp, struct vnode **vpp,
 		struct xfs_handle *handle)
 {
     struct xfs_node *result, *check;
-    struct mount *mp;
     int error;
 
     error = getnewvnode(VT_AFS, NNPFS_TO_VFS(xfsp), xfs_vnodeop_p, vpp);
diff --git a/sys/xfs/xfs_syscalls-common.c b/sys/xfs/xfs_syscalls-common.c
index 491ae9ddd2c..fa85b6649e8 100644
--- a/sys/xfs/xfs_syscalls-common.c
+++ b/sys/xfs/xfs_syscalls-common.c
@@ -375,6 +375,7 @@ getfh_compat (d_thread_t *p,
  * implement xfs fhget by combining (dev, ino, generation)
  */
 
+#ifndef __OpenBSD__
 static int
 trad_fhget (d_thread_t *p,
 	    struct ViceIoctl *vice_ioctl,
@@ -414,6 +415,7 @@ trad_fhget (d_thread_t *p,
     }
     return error;
 }
+#endif  /* ! __OpenBSD__ */
 
 /*
  * return file handle of `vp' in vice_ioctl->out
@@ -648,7 +650,7 @@ xfs_pioctl_call(d_thread_t *proc,
     case VIOC_FHOPEN :
 	return fhopen_call (proc, &vice_ioctl, vp,
 			    SCARG(arg, a_followSymlinks), return_value);
-    case VIOC_NNPFSDEBUG :
+    case VIOC_XFSDEBUG :
 	if (vp != NULL)
 	    vrele (vp);
 	return xfs_debug (proc, &vice_ioctl);
diff --git a/sys/xfs/xfs_vfsops-bsd.c b/sys/xfs/xfs_vfsops-bsd.c
index 56da67ae471..f20e27dd65f 100644
--- a/sys/xfs/xfs_vfsops-bsd.c
+++ b/sys/xfs/xfs_vfsops-bsd.c
@@ -256,8 +256,6 @@ xfs_checkexp (struct mount *mp,
 	      int *exflagsp,
 	      struct ucred **credanonp)
 {
-    struct netcred *np;
-
     NNPFSDEB(XDEBVFOPS, ("xfs_checkexp\n"));
 
 #if 0
diff --git a/sys/xfs/xfs_vnodeops-bsd.c b/sys/xfs/xfs_vnodeops-bsd.c
index 8c8e9c4c0c4..8a99754efc7 100644
--- a/sys/xfs/xfs_vnodeops-bsd.c
+++ b/sys/xfs/xfs_vnodeops-bsd.c
@@ -1185,6 +1185,7 @@ xfs_print (struct vop_print_args *v)
 int
 xfs_advlock(struct vop_advlock_args *v)
 {
+#if 0
     struct vop_advlock_args /* {
 	struct vnode *a_vp;
 	caddr_t  a_id;
@@ -1192,7 +1193,7 @@ xfs_advlock(struct vop_advlock_args *v)
 	struct flock *a_fl;
 	int  a_flags;
     } */ *ap = v;
-#if 0
+
     struct xfs_node *xn = VNODE_TO_XNODE(ap->a_vp);
     int ret;
     xfs_locktype_t locktype;
diff --git a/sys/xfs/xfs_vnodeops-common.c b/sys/xfs/xfs_vnodeops-common.c
index 5117970b56b..05be482af73 100644
--- a/sys/xfs/xfs_vnodeops-common.c
+++ b/sys/xfs/xfs_vnodeops-common.c
@@ -49,7 +49,9 @@ RCSID("$arla: xfs_vnodeops-common.c,v 1.94 2003/01/27 11:58:50 lha Exp $");
 static void
 xfs_handle_stale(struct xfs_node *xn)
 {
+#if __APPLE__
     struct vnode *vp = XNODE_TO_VNODE(xn);
+#endif
 
     if ((xn->flags & NNPFS_STALE) == 0)
 	return;