Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/nfs If send fails with EMSGSIZE for whatever reason, it'...



details:   https://anonhg.NetBSD.org/src/rev/0848052336a7
branches:  trunk
changeset: 748216:0848052336a7
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Oct 16 23:36:05 2009 +0000

description:
If send fails with EMSGSIZE for whatever reason, it's unlikely to
succeed no matter how hard we retry.  So just fail the request.

diffstat:

 sys/nfs/nfs_socket.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r d656d7a557ed -r 0848052336a7 sys/nfs/nfs_socket.c
--- a/sys/nfs/nfs_socket.c      Fri Oct 16 23:17:46 2009 +0000
+++ b/sys/nfs/nfs_socket.c      Fri Oct 16 23:36:05 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_socket.c,v 1.180 2009/03/14 21:04:25 dsl Exp $     */
+/*     $NetBSD: nfs_socket.c,v 1.181 2009/10/16 23:36:05 pooka Exp $   */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.180 2009/03/14 21:04:25 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.181 2009/10/16 23:36:05 pooka Exp $");
 
 #ifdef _KERNEL_OPT
 #include "fs_nfs.h"
@@ -523,7 +523,7 @@
                                 */
                                if (rep->r_flags & R_SOFTTERM)
                                        error = EINTR;
-                               else
+                               else if (error != EMSGSIZE)
                                        rep->r_flags |= R_MUSTRESEND;
                        }
                } else {
@@ -540,7 +540,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);



Home | Main Index | Thread Index | Old Index