CVS commit: [netbsd-5] src/sys/nfs

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Tue Mar 29 19:38:56 UTC 2011

Modified Files:
        src/sys/nfs [netbsd-5]: nfs_socket.c

Log Message:
Pull up following revision(s) (requested by tls in ticket #1582):
        sys/nfs/nfs_socket.c: revision 1.185
nfs_request: fix races which break congestion window and make nfs client stuck.


To generate a diff of this commit:
cvs rdiff -u -r1.173.4.6 -r1.173.4.7 src/sys/nfs/nfs_socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.173.4.6 src/sys/nfs/nfs_socket.c:1.173.4.7
--- src/sys/nfs/nfs_socket.c:1.173.4.6	Tue Mar 29 19:36:50 2011
+++ src/sys/nfs/nfs_socket.c	Tue Mar 29 19:38:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_socket.c,v 1.173.4.6 2011/03/29 19:36:50 riz Exp $	*/
+/*	$NetBSD: nfs_socket.c,v 1.173.4.7 2011/03/29 19:38:56 riz Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173.4.6 2011/03/29 19:36:50 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173.4.7 2011/03/29 19:38:56 riz Exp $");
 
 #include "fs_nfs.h"
 #include "opt_nfs.h"
@@ -1159,10 +1159,14 @@
 			if (nmp->nm_soflags & PR_CONNREQUIRED)
 				nfs_sndunlock(nmp);
 		}
+		s = splsoftnet();
 		if (!error && (rep->r_flags & R_MUSTRESEND) == 0) {
-			nmp->nm_sent += NFS_CWNDSCALE;
-			rep->r_flags |= R_SENT;
+			if ((rep->r_flags & R_SENT) == 0) {
+				nmp->nm_sent += NFS_CWNDSCALE;
+				rep->r_flags |= R_SENT;
+			}
 		}
+		splx(s);
 	} else {
 		splx(s);
 		rep->r_rtt = -1;
@@ -1179,7 +1183,6 @@
 	 */
 	s = splsoftnet();
 	TAILQ_REMOVE(&nfs_reqq, rep, r_chain);
-	splx(s);
 
 	/*
 	 * Decrement the outstanding request count.
@@ -1188,6 +1191,7 @@
 		rep->r_flags &= ~R_SENT;	/* paranoia */
 		nmp->nm_sent -= NFS_CWNDSCALE;
 	}
+	splx(s);
 
 	if (rexmitp != NULL) {
 		int rexmit;