diff --git a/sys/miscfs/genfs/genfs_vnops.c b/sys/miscfs/genfs/genfs_vnops.c index 7fc7f70a3c19..ab9a62e91ddf 100644 --- a/sys/miscfs/genfs/genfs_vnops.c +++ b/sys/miscfs/genfs/genfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: genfs_vnops.c,v 1.106 2005/10/07 18:07:46 elad Exp $ */ +/* $NetBSD: genfs_vnops.c,v 1.107 2005/10/07 18:19:14 elad Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -31,11 +31,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.106 2005/10/07 18:07:46 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.107 2005/10/07 18:19:14 elad Exp $"); #if defined(_KERNEL_OPT) #include "opt_nfsserver.h" -#include "opt_verified_exec.h" #endif #include @@ -50,9 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.106 2005/10/07 18:07:46 elad Exp $ #include #include #include -#ifdef VERIFIED_EXEC -#include -#endif /* VERIFIED_EXEC */ #include #include @@ -904,43 +900,6 @@ loopdone: uvm_pagermapout(kva, npages); raoffset = startoffset + totalbytes; -#if 0 - /* - * XXX This should not be here. We can't rely on all - * XXX filesystems to use genfs_getpages(), even though at the - * XXX moment that's the most common case (with the exception - * XXX of smbfs). - */ -#ifdef VERIFIED_EXEC - if (!error && !sawhole && !write) { - struct proc *veriexec_p = curlwp->l_proc; - struct vattr veriexec_va; - struct veriexec_hash_entry *vhe; - - /* XXXEE: try to eliminate this. */ - error = VOP_GETATTR(vp, &veriexec_va, veriexec_p->p_ucred, - veriexec_p); - if (error) - goto skip_veriexec; - - vhe = veriexec_lookup(veriexec_va.va_fsid, - veriexec_va.va_fileid); - if (vhe == NULL || vhe->page_fp == NULL) - goto skip_veriexec; - - pidx = origoffset >> PAGE_SHIFT; - - for (i = ridx; i < ridx + npages; i++) { - error = veriexec_page_verify(vhe, &veriexec_va, pgs[i], - pidx + i); - if (error) - break; - } - } -skip_veriexec: -#endif /* VERIFIED_EXEC */ -#endif /* 0 */ - /* * if this we encountered a hole then we have to do a little more work. * for read faults, we marked the page PG_RDONLY so that future