diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-09-09 10:37:05 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-09-09 10:37:05 +0000 |
| commit | 970787f7373758663abfd863435f27ac03b51fb4 (patch) | |
| tree | 81157216550a9d8ea8b4eee919fc1922fd3e82ba /sys/ufs | |
| parent | f11c329e7caff0cc9d3a1aa49dc295963a9e2793 (diff) | |
Rename lookup/relookup to vfs_lookup/vfs_relookup.
OK oga@, beck@, matthew@
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vnops.c | 8 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index e3653f07e25..0bc63b51edd 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.54 2010/09/06 23:44:10 thib Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.55 2010/09/09 10:37:04 thib Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -570,7 +570,7 @@ abortit: if ((fcnp->cn_flags & SAVESTART) == 0) panic("ext2fs_rename: lost from startdir"); fcnp->cn_nameiop = DELETE; - (void) relookup(fdvp, &fvp, fcnp); + (void) vfs_relookup(fdvp, &fvp, fcnp); return (VOP_REMOVE(fdvp, fvp, fcnp)); } if ((error = vn_lock(fvp, LK_EXCLUSIVE, p)) != 0) @@ -662,7 +662,7 @@ abortit: goto out; if ((tcnp->cn_flags & SAVESTART) == 0) panic("ext2fs_rename: lost to startdir"); - if ((error = relookup(tdvp, &tvp, tcnp)) != 0) + if ((error = vfs_relookup(tdvp, &tvp, tcnp)) != 0) goto out; dp = VTOI(tdvp); xp = NULL; @@ -787,7 +787,7 @@ abortit: fcnp->cn_flags |= LOCKPARENT | LOCKLEAF; if ((fcnp->cn_flags & SAVESTART) == 0) panic("ext2fs_rename: lost from startdir"); - (void) relookup(fdvp, &fvp, fcnp); + (void) vfs_relookup(fdvp, &fvp, fcnp); if (fvp != NULL) { xp = VTOI(fvp); dp = VTOI(fdvp); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index db815995baa..71b172273e1 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_vnops.c,v 1.93 2010/09/06 23:44:11 thib Exp $ */ +/* $OpenBSD: ufs_vnops.c,v 1.94 2010/09/09 10:37:04 thib Exp $ */ /* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */ /* @@ -748,7 +748,7 @@ abortit: if ((fcnp->cn_flags & SAVESTART) == 0) panic("ufs_rename: lost from startdir"); fcnp->cn_nameiop = DELETE; - if ((error = relookup(fdvp, &fvp, fcnp)) != 0) + if ((error = vfs_relookup(fdvp, &fvp, fcnp)) != 0) return (error); /* relookup did vrele() */ vrele(fdvp); return (VOP_REMOVE(fdvp, fvp, fcnp)); @@ -855,7 +855,7 @@ abortit: } if ((tcnp->cn_flags & SAVESTART) == 0) panic("ufs_rename: lost to startdir"); - if ((error = relookup(tdvp, &tvp, tcnp)) != 0) + if ((error = vfs_relookup(tdvp, &tvp, tcnp)) != 0) goto out; vrele(tdvp); /* relookup() acquired a reference */ dp = VTOI(tdvp); @@ -1004,7 +1004,7 @@ abortit: fcnp->cn_flags |= LOCKPARENT | LOCKLEAF; if ((fcnp->cn_flags & SAVESTART) == 0) panic("ufs_rename: lost from startdir"); - if ((error = relookup(fdvp, &fvp, fcnp)) != 0) { + if ((error = vfs_relookup(fdvp, &fvp, fcnp)) != 0) { vrele(ap->a_fvp); return (error); } |