From: Ben Kaduk <kaduk@mit.edu>
Date: Sat, 30 Oct 2010 06:23:24 +0000 (-0400)
Subject: FBSD: warning cleanups
X-Git-Tag: openafs-stable-1_6_0pre1~21
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c945f17666ad5a4cf36545476d46951732c7e8db;p=packages%2Fo%2Fopenafs.git

FBSD: warning cleanups

Only declare 'p' if it will be used; other unused variables;
signedness mismatches.

Kill spl with fire.

Reviewed-on: http://gerrit.openafs.org/3200
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit ebd18bfade80bd66422aad4310375ee460cd1ed5)

Change-Id: Iac808cf603043a8996f1c8657765ef8a0a7e6d88
Change-Id: I163a4314a0598eec9a514bbc564d8dc2ff91acae
Reviewed-on: http://gerrit.openafs.org/3458
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c
index ecd5837af..02fe2536f 100644
--- a/src/afs/FBSD/osi_file.c
+++ b/src/afs/FBSD/osi_file.c
@@ -158,7 +158,7 @@ int
 afs_osi_Read(struct osi_file *afile, int offset, void *aptr,
 	     afs_int32 asize)
 {
-    unsigned int resid;
+    int resid;
     afs_int32 code;
     AFS_STATCNT(osi_Read);
 
diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h
index 5bc44545c..6b98f889b 100644
--- a/src/afs/FBSD/osi_machdep.h
+++ b/src/afs/FBSD/osi_machdep.h
@@ -144,11 +144,11 @@ extern struct thread *afs_global_owner;
 # endif
 
 #undef SPLVAR
-#define SPLVAR int splvar
+#define SPLVAR
 #undef NETPRI
-#define NETPRI splvar=splnet()
+#define NETPRI
 #undef USERPRI
-#define USERPRI splx(splvar)
+#define USERPRI
 
 #define osi_procname(procname, size) strncpy(procname, curproc->p_comm, size)
 
diff --git a/src/afs/FBSD/osi_vcache.c b/src/afs/FBSD/osi_vcache.c
index d00ba68b4..6530bb04e 100644
--- a/src/afs/FBSD/osi_vcache.c
+++ b/src/afs/FBSD/osi_vcache.c
@@ -15,7 +15,6 @@
 
 int
 osi_TryEvictVCache(struct vcache *avc, int *slept) {
-    struct vnode *vp = AFSTOV(avc);
 
     /*
      * essentially all we want to do here is check that the
diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c
index 571fb67c1..438ec92f9 100644
--- a/src/afs/FBSD/osi_vm.c
+++ b/src/afs/FBSD/osi_vm.c
@@ -80,7 +80,6 @@
 int
 osi_VM_FlushVCache(struct vcache *avc, int *slept)
 {
-    struct vm_object *obj;
     struct vnode *vp = AFSTOV(avc);
 
     if (!VI_TRYLOCK(vp)) /* need interlock to check usecount */
@@ -186,14 +185,11 @@ osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync)
     int tries, code;
     int islocked;
 
-    SPLVAR;
-
     vp = AFSTOV(avc);
 
     VI_LOCK(vp);
     if (vp->v_iflag & VI_DOOMED) {
 	VI_UNLOCK(vp);
-	USERPRI;
 	return;
     }
     VI_UNLOCK(vp);
@@ -238,7 +234,6 @@ osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync)
 	vn_lock(vp, LK_DOWNGRADE);
     else if (!islocked)
 	VOP_UNLOCK(vp, 0);
-    USERPRI;
 }
 
 /* Purge VM for a file when its callback is revoked.
diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 5bb5f658d..234668ac4 100644
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -481,7 +481,9 @@ afs_vop_lookup(ap)
     int flags = ap->a_cnp->cn_flags;
     int lockparent;		/* 1 => lockparent flag is set */
     int wantparent;		/* 1 => wantparent or lockparent flag */
+#ifndef AFS_FBSD80_ENV
     struct thread *p = ap->a_cnp->cn_thread;
+#endif
 
     dvp = ap->a_dvp;
     if (dvp->v_type != VDIR) {
@@ -573,7 +575,9 @@ afs_vop_create(ap)
     int error = 0;
     struct vcache *vcp;
     struct vnode *dvp = ap->a_dvp;
+#ifndef AFS_FBSD80_ENV
     struct thread *p = ap->a_cnp->cn_thread;
+#endif
     GETNAME();
 
     AFS_GLOCK();
@@ -1151,7 +1155,9 @@ afs_vop_link(ap)
     int error = 0;
     struct vnode *dvp = ap->a_tdvp;
     struct vnode *vp = ap->a_vp;
+#ifndef AFS_FBSD80_ENV
     struct thread *p = ap->a_cnp->cn_thread;
+#endif
 
     GETNAME();
     if (dvp->v_mount != vp->v_mount) {
@@ -1195,7 +1201,9 @@ afs_vop_rename(ap)
     struct vnode *tdvp = ap->a_tdvp;
     struct vnode *fvp = ap->a_fvp;
     struct vnode *fdvp = ap->a_fdvp;
+#ifndef AFS_FBSD80_ENV
     struct thread *p = fcnp->cn_thread;
+#endif
 
     /*
      * Check for cross-device rename.
@@ -1297,7 +1305,9 @@ afs_vop_mkdir(ap)
     struct vattr *vap = ap->a_vap;
     int error = 0;
     struct vcache *vcp;
+#ifndef AFS_FBSD80_ENV
     struct thread *p = ap->a_cnp->cn_thread;
+#endif
 
     GETNAME();
 #ifdef DIAGNOSTIC
diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
index 8072ba838..5b7863f24 100644
--- a/src/rx/FBSD/rx_knet.c
+++ b/src/rx/FBSD/rx_knet.c
@@ -88,11 +88,13 @@ osi_StopListener(void)
 	AFS_GUNLOCK();
     soshutdown(rx_socket, SHUT_RDWR);
     p = pfind(rxk_ListenerPid);
-    afs_warn("osi_StopListener: rxk_ListenerPid %lx\n", p);
     if (p) {
+	afs_warn("osi_StopListener: rxk_ListenerPid %u\n", rxk_ListenerPid);
 	psignal(p, SIGUSR1);
 	PROC_UNLOCK(p);
-    }
+    } else
+	afs_warn("osi_StopListener: rxk_Listener not found (pid %u)\n",
+	    rxk_ListenerPid);
 #ifdef AFS_FBSD70_ENV
     {
       /* Avoid destroying socket until osi_NetReceive has