Module Name: src
Committed By: riz
Date: Tue Mar 29 19:36:50 UTC 2011
Modified Files:
src/sys/nfs [netbsd-5]: nfs_socket.c
Log Message:
Pull up following revision(s) (requested by tls in ticket #1581):
sys/nfs/nfs_socket.c: revision 1.181
If send fails with EMSGSIZE for whatever reason, it's unlikely to
succeed no matter how hard we retry. So just fail the request.
To generate a diff of this commit:
cvs rdiff -u -r1.173.4.5 -r1.173.4.6 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.5 src/sys/nfs/nfs_socket.c:1.173.4.6
--- src/sys/nfs/nfs_socket.c:1.173.4.5 Tue Mar 29 19:34:45 2011
+++ src/sys/nfs/nfs_socket.c Tue Mar 29 19:36:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_socket.c,v 1.173.4.5 2011/03/29 19:34:45 riz Exp $ */
+/* $NetBSD: nfs_socket.c,v 1.173.4.6 2011/03/29 19:36:50 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.5 2011/03/29 19:34:45 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173.4.6 2011/03/29 19:36:50 riz Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@@ -540,7 +540,7 @@
*/
if (rep->r_flags & R_SOFTTERM)
error = EINTR;
- else
+ else if (error != EMSGSIZE)
rep->r_flags |= R_MUSTRESEND;
}
} else {
@@ -557,7 +557,8 @@
* Handle any recoverable (soft) socket errors here. (? ? ?)
*/
if (error != EINTR && error != ERESTART &&
- error != EWOULDBLOCK && error != EPIPE)
+ error != EWOULDBLOCK && error != EPIPE &&
+ error != EMSGSIZE)
error = 0;
}
return (error);
