From c26582e6b3ff82f5c01eeb1c853af1b569e7c81e Mon Sep 17 00:00:00 2001 From: cegger Date: Tue, 14 Dec 2010 16:25:18 +0000 Subject: [PATCH] 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. --- sys/nfs/nfs_vnops.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 8d945342e95a..dc5d494811aa 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -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 -__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 @@ retry: 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);