[src/netbsd-1-6]: src/sys/nfs Pull up revision 1.82 (requested by bouyer in t...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0a6de409c8ad
branches:  netbsd-1-6
changeset: 529058:0a6de409c8ad
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Sep 01 14:00:17 2002 +0000

description:
Pull up revision 1.82 (requested by bouyer in ticket #752):
nfs_doio(): handle the case where nfs_writerpc() returned error != 0.
Fix kern/18125. OK'd by thorpej and chs.

diffstat:

 sys/nfs/nfs_bio.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 8fcfd6e93a66 -r 0a6de409c8ad sys/nfs/nfs_bio.c
--- a/sys/nfs/nfs_bio.c Sun Sep 01 13:58:00 2002 +0000
+++ b/sys/nfs/nfs_bio.c Sun Sep 01 14:00:17 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_bio.c,v 1.81 2002/05/06 03:20:54 enami Exp $       */
+/*     $NetBSD: nfs_bio.c,v 1.81.4.1 2002/09/01 14:00:17 lukem Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.81 2002/05/06 03:20:54 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.81.4.1 2002/09/01 14:00:17 lukem Exp $");
 
 #include "opt_nfs.h"
 #include "opt_ddb.h"
@@ -1077,6 +1077,12 @@
                        pgs[i]->flags &= ~(PG_NEEDCOMMIT | PG_RDONLY);
                }
                simple_unlock(&uobj->vmobjlock);
+           } else {
+               if (error) {
+                       bp->b_flags |= B_ERROR;
+                       bp->b_error = np->n_error = error;
+                       np->n_flag |= NWRITEERR;
+               }
            }
        }
        bp->b_resid = uiop->uio_resid;