diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2004-07-25 23:09:20 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2004-07-25 23:09:20 +0000 |
| commit | f07f2af5ea1b5b963f667a351c7358e597f07b22 (patch) | |
| tree | c628f9a9d35814ccf04df2875bacfddbc413b02e /sys | |
| parent | 6530545953648f91a0d68afa16e6cb4963628a11 (diff) | |
more consistent handling of vnode recount during rename.
should solve some panics. various testing for a while.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 573a2c40ab6..a06fda3d6cb 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.57 2004/06/25 00:54:28 tholo Exp $ */ +/* $OpenBSD: ufs_vnops.c,v 1.58 2004/07/25 23:09:19 tedu Exp $ */ /* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */ /* @@ -913,7 +913,6 @@ abortit: * Relookup() may find a file that is unrelated to the * original one, or it may fail. Too bad. */ - vrele(fdvp); vrele(fvp); fcnp->cn_flags &= ~MODMASK; fcnp->cn_flags |= LOCKPARENT | LOCKLEAF; @@ -921,6 +920,7 @@ abortit: panic("ufs_rename: lost from startdir"); fcnp->cn_nameiop = DELETE; (void) relookup(fdvp, &fvp, fcnp); + vrele(fdvp); if (fvp == NULL) { return (ENOENT); } @@ -970,8 +970,6 @@ abortit: doingdirectory = 1; } VN_KNOTE(fdvp, NOTE_WRITE); /* XXX right place? */ - /* Why? */ - vrele(fdvp); /* * When the target exists, both the directory @@ -1174,6 +1172,7 @@ abortit: if ((fcnp->cn_flags & SAVESTART) == 0) panic("ufs_rename: lost from startdir"); (void) relookup(fdvp, &fvp, fcnp); + vrele(fdvp); if (fvp != NULL) { xp = VTOI(fvp); dp = VTOI(fdvp); @@ -1226,6 +1225,7 @@ bad: vput(ITOV(xp)); vput(ITOV(dp)); out: + vrele(fdvp); if (doingdirectory) ip->i_flag &= ~IN_RENAME; if (vn_lock(fvp, LK_EXCLUSIVE, p) == 0) { |