Module Name: src
Committed By: cegger
Date: Tue Dec 14 16:25:19 UTC 2010
Modified Files:
src/sys/nfs: nfs_vnops.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 src/sys/nfs/nfs_vnops.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_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.287 src/sys/nfs/nfs_vnops.c:1.288
--- src/sys/nfs/nfs_vnops.c:1.287 Tue Nov 30 10:43:05 2010
+++ src/sys/nfs/nfs_vnops.c Tue Dec 14 16:25:18 2010
@@ -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);
