Module Name: src
Committed By: msaitoh
Date: Sun Nov 9 07:50:12 UTC 2014
Modified Files:
src/sys/fs/puffs [netbsd-6]: puffs_vnops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1184):
sys/fs/puffs/puffs_vnops.c: revision 1.195
According to pooka@'s comment, a long time ago, VOP_STRATEGY could not
fail without taking down the kernel. It seems this is not the case
anymore,
hence we can stop dropping errors in puffs_vnop_strategy()
Approved by pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.163.2.8 -r1.163.2.9 src/sys/fs/puffs/puffs_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/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.163.2.8 src/sys/fs/puffs/puffs_vnops.c:1.163.2.9
--- src/sys/fs/puffs/puffs_vnops.c:1.163.2.8 Sun Nov 9 06:28:03 2014
+++ src/sys/fs/puffs/puffs_vnops.c Sun Nov 9 07:50:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.163.2.8 2014/11/09 06:28:03 msaitoh Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.163.2.9 2014/11/09 07:50:12 msaitoh Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.163.2.8 2014/11/09 06:28:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.163.2.9 2014/11/09 07:50:12 msaitoh Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -2762,13 +2762,6 @@ puffs_vnop_strategy(void *v)
if (dobiodone == 0)
goto out;
- /*
- * XXXXXXXX: wrong, but kernel can't survive strategy
- * failure currently. Here, have one more X: X.
- */
- if (error != ENOMEM)
- error = 0;
-
error = checkerr(pmp, error, __func__);
if (error)
goto out;
