summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-03-31 21:39:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-03-31 21:39:45 +0000
commit709371c0022a2d794830188816ed9d4b76a6c90f (patch)
treee5171c1afcf471a4f18e6ccbbe14fa2b23731a9c
parentbe5f02af7ac0b9725cc93124cfcde2ac9e765ef7 (diff)
re-commit marius commit:
> fix preposterous time warnings in the nfs client; caused by false hits > in the attribute cache > based on original fix by pedro@, ok pedro@, tedu@; testing kettenis@ was backed out because too close to release put back in now, since tree is unlocked. unfortunately it appears that even after MANY MAILS ON THIS SUBJECT, NOONE HAS DONE THIS. WTF? Noone wants to FINISH jobs anymore?
-rw-r--r--sys/nfs/nfs_vfsops.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index c2c74cfe9d2..208cb0ef8aa 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_vfsops.c,v 1.55 2005/02/01 15:00:04 pvalchev Exp $ */
+/* $OpenBSD: nfs_vfsops.c,v 1.56 2005/03/31 21:39:44 deraadt Exp $ */
/* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */
/*
@@ -261,15 +261,6 @@ nfs_mountroot()
procp = curproc; /* XXX */
/*
- * XXX time must be non-zero when we init the interface or else
- * the arp code will wedge. [Fixed now in if_ether.c]
- * However, the NFS attribute cache gives false "hits" when
- * time_second < NFS_ATTRTIMEO(np) so keep this in for now.
- */
- if (time_second < NFS_MAXATTRTIMO)
- time_second = NFS_MAXATTRTIMO;
-
- /*
* Call nfs_boot_init() to fill in the nfs_diskless struct.
* Side effect: Finds and configures a network interface.
*/