summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2002-08-27 16:04:43 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2002-08-27 16:04:43 +0000
commit537ca814590757f8822bd02eb3134d82c48bca21 (patch)
treeb63e74f5fa3d84f3717a3401eb4d44dc25e76f1d
parent3bbc9765b411ebbfdd17dc152a93daa0062258f7 (diff)
call ktrnamei() later, after cnp->cn_pnbuf has been made proper; art@ ok
-rw-r--r--sys/kern/vfs_lookup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index dc97cfe1eff..56aaaaa5ca9 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_lookup.c,v 1.20 2002/07/02 04:23:25 ericj Exp $ */
+/* $OpenBSD: vfs_lookup.c,v 1.21 2002/08/27 16:04:42 mickey Exp $ */
/* $NetBSD: vfs_lookup.c,v 1.17 1996/02/09 19:00:59 christos Exp $ */
/*
@@ -115,11 +115,6 @@ namei(ndp)
error = copyinstr(ndp->ni_dirp, cnp->cn_pnbuf,
MAXPATHLEN, &ndp->ni_pathlen);
-#ifdef KTRACE
- if (KTRPOINT(cnp->cn_proc, KTR_NAMEI))
- ktrnamei(cnp->cn_proc, cnp->cn_pnbuf);
-#endif
-
/*
* Fail on null pathnames
*/
@@ -132,6 +127,11 @@ namei(ndp)
return (error);
}
+#ifdef KTRACE
+ if (KTRPOINT(cnp->cn_proc, KTR_NAMEI))
+ ktrnamei(cnp->cn_proc, cnp->cn_pnbuf);
+#endif
+
/*
* Strip trailing slashes, as requested
*/