Re: RIP hzto(9) 2/4: NFS

2015-06-09 Thread David Gwynne 
ok.

 On 10 Jun 2015, at 07:41, Mike Belopuhov m...@belopuhov.com wrote:
 
 OK?
 
 diff --git sys/nfs/nfs_socket.c sys/nfs/nfs_socket.c
 index 9edd615..a4a279f 100644
 --- sys/nfs/nfs_socket.c
 +++ sys/nfs/nfs_socket.c
 @@ -1003,13 +1003,13 @@ tryagain:
   error = fxdr_unsigned(int, *tl);
   if ((nmp-nm_flag  NFSMNT_NFSV3) 
   error == NFSERR_TRYLATER) {
   m_freem(info.nmi_mrep);
   error = 0;
 - tv.tv_sec = time_second + trylater_delay;
 + tv.tv_sec = trylater_delay;
   tv.tv_usec = 0;
 - tsleep(tv, PSOCK, nfsretry, hzto(tv));
 + tsleep(tv, PSOCK, nfsretry, tvtohz(tv));
   trylater_delay *= NFS_TIMEOUTMUL;
   if (trylater_delay  NFS_MAXTIMEO)
   trylater_delay = NFS_MAXTIMEO;
 
   goto tryagain;

RIP hzto(9) 2/4: NFS

2015-06-09 Thread Mike Belopuhov 
OK?

diff --git sys/nfs/nfs_socket.c sys/nfs/nfs_socket.c
index 9edd615..a4a279f 100644
--- sys/nfs/nfs_socket.c
+++ sys/nfs/nfs_socket.c
@@ -1003,13 +1003,13 @@ tryagain:
error = fxdr_unsigned(int, *tl);
if ((nmp-nm_flag  NFSMNT_NFSV3) 
error == NFSERR_TRYLATER) {
m_freem(info.nmi_mrep);
error = 0;
-   tv.tv_sec = time_second + trylater_delay;
+   tv.tv_sec = trylater_delay;
tv.tv_usec = 0;
-   tsleep(tv, PSOCK, nfsretry, hzto(tv));
+   tsleep(tv, PSOCK, nfsretry, tvtohz(tv));
trylater_delay *= NFS_TIMEOUTMUL;
if (trylater_delay  NFS_MAXTIMEO)
trylater_delay = NFS_MAXTIMEO;
 
goto tryagain;