summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeff <jeff@FreeBSD.org>2002-08-05 08:55:53 +0000
committerjeff <jeff@FreeBSD.org>2002-08-05 08:55:53 +0000
commitfbb42c58e2ac222340d969f06ce50338c2d7c71d (patch)
tree6bb75329b2b0a448e953c6f67094124437625050
parentfcdac052f8a3e4ce3c2d8b95e8b646ef97392714 (diff)
downloadFreeBSD-src-fbb42c58e2ac222340d969f06ce50338c2d7c71d.zip
FreeBSD-src-fbb42c58e2ac222340d969f06ce50338c2d7c71d.tar.gz
- Move a VOP assert to the right place.
Spotted by: i386 tinderbox
-rw-r--r--sys/kern/vfs_cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 6e68c2f..a8b4dfd 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -828,7 +828,6 @@ vn_fullpath(struct thread *td, struct vnode *vn, char **retbuf, char **freebuf)
return (ENODEV);
if (vn == NULL)
return (EINVAL);
- ASSERT_VOP_LOCKED(vp, "vn_fullpath");
buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
bp = buf + MAXPATHLEN - 1;
*bp = '\0';
@@ -836,6 +835,7 @@ vn_fullpath(struct thread *td, struct vnode *vn, char **retbuf, char **freebuf)
slash_prefixed = 0;
FILEDESC_LOCK(fdp);
for (vp = vn; vp != fdp->fd_rdir && vp != rootvnode;) {
+ ASSERT_VOP_LOCKED(vp, "vn_fullpath");
if (vp->v_vflag & VV_ROOT) {
if (vp->v_mount == NULL) { /* forced unmount */
FILEDESC_UNLOCK(fdp);
OpenPOWER on IntegriCloud