Source-Changes-HG archive

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

[src/trunk]: src/sys/nfs back out rev. 1.285. The problem I try to hunt down



details:   https://anonhg.NetBSD.org/src/rev/8ab94fbbda43
branches:  trunk
changeset: 759658:8ab94fbbda43
user:      cegger <cegger%NetBSD.org@localhost>
date:      Tue Dec 14 16:25:18 2010 +0000

description:
back out rev. 1.285. The problem I try to hunt down
in PR 42455 is not in the network stack as shown by PR 44206.

diffstat:

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

diffs (33 lines):

diff -r 6a8af315a086 -r 8ab94fbbda43 sys/nfs/nfs_vnops.c
--- a/sys/nfs/nfs_vnops.c       Tue Dec 14 16:23:59 2010 +0000
+++ b/sys/nfs/nfs_vnops.c       Tue Dec 14 16:25:18 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_vnops.c,v 1.287 2010/11/30 10:43:05 dholland Exp $ */
+/*     $NetBSD: nfs_vnops.c,v 1.288 2010/12/14 16:25:18 cegger Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.287 2010/11/30 10:43:05 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.288 2010/12/14 16:25:18 cegger Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -1369,14 +1369,6 @@
                if (v3) {
                        wccflag = NFSV3_WCCCHK;
                        nfsm_wcc_data(vp, wccflag, NAC_NOTRUNC, !error);
-
-                       /* Diagnostic check: The KASSERT hits when PR 42455
-                        * is reproduced.
-                        */
-                       if (ctx.nwc_mbufcount >= 2) {
-                               KASSERT(mb->m_next != NULL);
-                       }
-
                        if (!error) {
                                nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED
                                        + NFSX_V3WRITEVERF);



Home | Main Index | Thread Index | Old Index