diff options
Diffstat (limited to 'sys/kern/vfs_vnops.c')
| -rw-r--r-- | sys/kern/vfs_vnops.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index d27a0115b6d..1fb0d1365cc 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_vnops.c,v 1.160 2008/08/27 06:28:09 christos Exp $ */ +/* $NetBSD: vfs_vnops.c,v 1.161 2008/11/12 12:36:16 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -37,9 +37,8 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.160 2008/08/27 06:28:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.161 2008/11/12 12:36:16 ad Exp $"); -#include "fs_union.h" #include "veriexec.h" #include <sys/param.h> @@ -72,9 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.160 2008/08/27 06:28:09 christos Exp #include <fs/union/union.h> #endif -#if defined(LKM) || defined(UNION) int (*vn_union_readdir_hook) (struct vnode **, struct file *, struct lwp *); -#endif #include <sys/verified_exec.h> @@ -403,7 +400,6 @@ unionread: if (error) return (error); -#if defined(UNION) || defined(LKM) if (count == auio.uio_resid && vn_union_readdir_hook) { struct vnode *ovp = vp; @@ -413,7 +409,6 @@ unionread: if (vp != ovp) goto unionread; } -#endif /* UNION || LKM */ if (count == auio.uio_resid && (vp->v_vflag & VV_ROOT) && (vp->v_mount->mnt_flag & MNT_UNION)) { |
