Tue Oct 7 01:20:37 2008 UTC ()
nuke outdated comment


(pooka)
diff -r1.172 -r1.173 src/sys/nfs/nfs_socket.c

cvs diff -r1.172 -r1.173 src/sys/nfs/nfs_socket.c (expand / switch to unified diff)

--- src/sys/nfs/nfs_socket.c 2008/09/30 14:25:15 1.172
+++ src/sys/nfs/nfs_socket.c 2008/10/07 01:20:37 1.173
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: nfs_socket.c,v 1.172 2008/09/30 14:25:15 pooka Exp $ */ 1/* $NetBSD: nfs_socket.c,v 1.173 2008/10/07 01:20:37 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1989, 1991, 1993, 1995 4 * Copyright (c) 1989, 1991, 1993, 1995
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Rick Macklem at The University of Guelph. 8 * Rick Macklem at The University of Guelph.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 * 33 *
34 * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 34 * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95
35 */ 35 */
36 36
37/* 37/*
38 * Socket operations for use by nfs 38 * Socket operations for use by nfs
39 */ 39 */
40 40
41#include <sys/cdefs.h> 41#include <sys/cdefs.h>
42__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.172 2008/09/30 14:25:15 pooka Exp $"); 42__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173 2008/10/07 01:20:37 pooka Exp $");
43 43
44#include "fs_nfs.h" 44#include "fs_nfs.h"
45#include "opt_nfs.h" 45#include "opt_nfs.h"
46#include "opt_nfsserver.h" 46#include "opt_nfsserver.h"
47#include "opt_mbuftrace.h" 47#include "opt_mbuftrace.h"
48#include "opt_inet.h" 48#include "opt_inet.h"
49 49
50#include <sys/param.h> 50#include <sys/param.h>
51#include <sys/systm.h> 51#include <sys/systm.h>
52#include <sys/evcnt.h> 52#include <sys/evcnt.h>
53#include <sys/callout.h> 53#include <sys/callout.h>
54#include <sys/proc.h> 54#include <sys/proc.h>
55#include <sys/mount.h> 55#include <sys/mount.h>
@@ -1595,27 +1595,26 @@ nfs_timer_init(void) @@ -1595,27 +1595,26 @@ nfs_timer_init(void)
1595 evcnt_attach_dynamic(&nfs_timer_ev, EVCNT_TYPE_MISC, NULL, 1595 evcnt_attach_dynamic(&nfs_timer_ev, EVCNT_TYPE_MISC, NULL,
1596 "nfs", "timer"); 1596 "nfs", "timer");
1597 evcnt_attach_dynamic(&nfs_timer_start_ev, EVCNT_TYPE_MISC, NULL, 1597 evcnt_attach_dynamic(&nfs_timer_start_ev, EVCNT_TYPE_MISC, NULL,
1598 "nfs", "timer start"); 1598 "nfs", "timer start");
1599 evcnt_attach_dynamic(&nfs_timer_stop_ev, EVCNT_TYPE_MISC, NULL, 1599 evcnt_attach_dynamic(&nfs_timer_stop_ev, EVCNT_TYPE_MISC, NULL,
1600 "nfs", "timer stop"); 1600 "nfs", "timer stop");
1601} 1601}
1602 1602
1603/* 1603/*
1604 * Nfs timer routine 1604 * Nfs timer routine
1605 * Scan the nfsreq list and retranmit any requests that have timed out 1605 * Scan the nfsreq list and retranmit any requests that have timed out
1606 * To avoid retransmission attempts on STREAM sockets (in the future) make 1606 * To avoid retransmission attempts on STREAM sockets (in the future) make
1607 * sure to set the r_retry field to 0 (implies nm_retry == 0). 1607 * sure to set the r_retry field to 0 (implies nm_retry == 0).
1608 * A non-NULL argument means 'initialize'. 
1609 */ 1608 */
1610void 1609void
1611nfs_timer(void *arg) 1610nfs_timer(void *arg)
1612{ 1611{
1613 struct nfsreq *rep; 1612 struct nfsreq *rep;
1614 struct mbuf *m; 1613 struct mbuf *m;
1615 struct socket *so; 1614 struct socket *so;
1616 struct nfsmount *nmp; 1615 struct nfsmount *nmp;
1617 int timeo; 1616 int timeo;
1618 int s, error; 1617 int s, error;
1619 bool more = false; 1618 bool more = false;
1620#ifdef NFSSERVER 1619#ifdef NFSSERVER
1621 struct timeval tv; 1620 struct timeval tv;