diff options
| author | Alfred Perlstein <alfred@FreeBSD.org> | 2002-11-20 10:13:04 +0000 |
|---|---|---|
| committer | Alfred Perlstein <alfred@FreeBSD.org> | 2002-11-20 10:13:04 +0000 |
| commit | 0b2724b10f4fbe2144774a96716fe3e33f5f67f5 (patch) | |
| tree | edf42b933bf509ac86190157503409b13816a88e /sys | |
| parent | 9822015014ff143da0833169c88ec7b86e31373a (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/nfsclient/nfs_lock.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c index 593532d71a392..67f049abb5b0c 100644 --- a/sys/nfsclient/nfs_lock.c +++ b/sys/nfsclient/nfs_lock.c @@ -60,12 +60,6 @@ __FBSDID("$FreeBSD$"); #include <nfsclient/nfs_lock.h> #include <nfsclient/nlminfo.h> -#define NFSOWNER_1ST_LEVEL_START 1 /* initial entries */ -#define NFSOWNER_2ND_LEVEL 256 /* some power of 2 */ - -#define NFSOWNER(tbl, i) \ - (tbl)[(i) / NFSOWNER_2ND_LEVEL][(i) % NFSOWNER_2ND_LEVEL] - /* * XXX * We have to let the process know if the call succeeded. I'm using an extra @@ -187,8 +181,8 @@ nfs_dolock(struct vop_advlock_args *ap) * on a local network). XXX Probably should use a back-off * scheme. */ - if ((error = tsleep((void *)p->p_nlminfo, - PCATCH | PUSER, "lockd", 20*hz)) != 0) { + error = tsleep(p->p_nlminfo, PCATCH | PUSER, "lockd", 20*hz); + if (error != 0) { if (error == EWOULDBLOCK) { /* * We timed out, so we rewrite the request @@ -264,7 +258,7 @@ nfslockdans(struct thread *td, struct lockd_ans *ansp) targetp->p_nlminfo->set_getlk_pid = ansp->la_set_getlk_pid; targetp->p_nlminfo->getlk_pid = ansp->la_getlk_pid; - (void)wakeup((void *)targetp->p_nlminfo); + wakeup(targetp->p_nlminfo); PROC_UNLOCK(targetp); return (0); |