From 7b63f0de5dc7c2d964343b8f9ab6248222f7e8ba Mon Sep 17 00:00:00 2001 From: pooka Date: Sun, 18 Feb 2007 01:55:26 +0000 Subject: [PATCH] Don't check for validity of p in lookup for root nodes, since it will always be NULL. Rather, just call pt_valid with NULL directly and let it decide if we're a linux mount or not. --- sys/miscfs/procfs/procfs_vnops.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 5ae0f18a6b8b..35efd90b6691 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vnops.c,v 1.149 2007/02/17 22:31:44 pavel Exp $ */ +/* $NetBSD: procfs_vnops.c,v 1.150 2007/02/18 01:55:26 pooka Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -112,7 +112,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.149 2007/02/17 22:31:44 pavel Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.150 2007/02/18 01:55:26 pooka Exp $"); #include #include @@ -1001,11 +1001,14 @@ procfs_lookup(v) for (i = 0; i < nproc_root_targets; i++) { pt = &proc_root_targets[i]; + /* + * check for node match. proc is always NULL here, + * so call pt_valid with constant NULL lwp. + */ if (cnp->cn_namelen == pt->pt_namlen && memcmp(pt->pt_name, pname, cnp->cn_namelen) == 0 && - (pt->pt_valid == NULL || (p != NULL && - (*pt->pt_valid)(LIST_FIRST(&p->p_lwps), - dvp->v_mount)))) + (pt->pt_valid == NULL || + (*pt->pt_valid)(NULL, dvp->v_mount))) break; }