use kpause rather than lbolt.

This commit is contained in:
yamt 2007-08-05 09:40:39 +00:00
parent 8438931b2b
commit 1f0f803e45
2 changed files with 7 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_socket.c,v 1.162 2007/08/02 12:45:37 yamt Exp $ */
/* $NetBSD: nfs_socket.c,v 1.163 2007/08/05 09:40:39 yamt Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.162 2007/08/02 12:45:37 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.163 2007/08/05 09:40:39 yamt Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@ -377,7 +377,7 @@ nfs_reconnect(rep, l)
while ((error = nfs_connect(nmp, rep, l)) != 0) {
if (error == EINTR || error == ERESTART)
return (EINTR);
(void) tsleep((void *)&lbolt, PSOCK, "nfscn2", 0);
kpause("nfscn2", false, hz, NULL);
}
/*
@ -1369,7 +1369,7 @@ tryagain:
error = 0;
waituntil = time_second + trylater_delay;
while (time_second < waituntil) {
tsleep(&lbolt, PSOCK, "nfstrylater", 0);
kpause("nfstrylater", false, hz, NULL);
}
trylater_delay *= NFS_TRYLATERDELMUL;
if (trylater_delay > NFS_TRYLATERDELMAX)

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vfsops.c,v 1.182 2007/07/31 21:14:19 pooka Exp $ */
/* $NetBSD: nfs_vfsops.c,v 1.183 2007/08/05 09:40:40 yamt Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.182 2007/07/31 21:14:19 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.183 2007/08/05 09:40:40 yamt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -561,8 +561,7 @@ nfs_decode_args(nmp, argp, l)
if (nmp->nm_sotype == SOCK_DGRAM)
while (nfs_connect(nmp, (struct nfsreq *)0, l)) {
printf("nfs_args: retrying connect\n");
(void) tsleep((void *)&lbolt,
PSOCK, "nfscn3", 0);
kpause("nfscn3", false, hz, NULL);
}
}
}