Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/miscfs/genfs Pull up following revision(s) (requested...
details: https://anonhg.NetBSD.org/src/rev/61f185c33752
branches: netbsd-8
changeset: 434068:61f185c33752
user: martin <martin%NetBSD.org@localhost>
date: Wed Jul 05 15:50:24 2017 +0000
description:
Pull up following revision(s) (requested by hannken in ticket #84):
sys/miscfs/genfs/genfs_io.c: revision 1.70
Add missing check for dead or dying vnode to the entry of genfs_getpages().
diffstat:
sys/miscfs/genfs/genfs_io.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diffs (32 lines):
diff -r d4a0a80b46d0 -r 61f185c33752 sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c Wed Jul 05 15:48:01 2017 +0000
+++ b/sys/miscfs/genfs/genfs_io.c Wed Jul 05 15:50:24 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.68.6.1 2017/06/04 20:35:01 bouyer Exp $ */
+/* $NetBSD: genfs_io.c,v 1.68.6.2 2017/07/05 15:50:24 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.68.6.1 2017/06/04 20:35:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.68.6.2 2017/07/05 15:50:24 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,6 +139,13 @@
KASSERT(vp->v_type == VREG || vp->v_type == VDIR ||
vp->v_type == VLNK || vp->v_type == VBLK);
+ error = vdead_check(vp, VDEAD_NOWAIT);
+ if (error) {
+ if ((flags & PGO_LOCKED) == 0)
+ mutex_exit(uobj->vmobjlock);
+ return error;
+ }
+
startover:
error = 0;
const voff_t origvsize = vp->v_size;
Home |
Main Index |
Thread Index |
Old Index