diff options
| author | eivind <eivind@FreeBSD.org> | 1999-11-13 20:58:17 +0000 |
|---|---|---|
| committer | eivind <eivind@FreeBSD.org> | 1999-11-13 20:58:17 +0000 |
| commit | 4ce73d70968875fa0c07f07e90a2bdcb84726bd6 (patch) | |
| tree | 1a5eba3223a453fbc8060d31521181433ce7f3f3 /sys/kern | |
| parent | 91b25fa7a9d94c9097d6ebf1d8ec6b1a332f8e04 (diff) | |
| download | FreeBSD-src-4ce73d70968875fa0c07f07e90a2bdcb84726bd6.zip FreeBSD-src-4ce73d70968875fa0c07f07e90a2bdcb84726bd6.tar.gz | |
Remove WILLRELE from VOP_SYMLINK
Note: Previous commit to these files (except coda_vnops and devfs_vnops)
that claimed to remove WILLRELE from VOP_RENAME actually removed it from
VOP_MKNOD.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_extattr.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 2 | ||||
| -rw-r--r-- | sys/kern/vnode_if.src | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 2f4aa01..19c9d90 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -1303,6 +1303,8 @@ symlink(p, uap) vattr.va_mode = ACCESSPERMS &~ p->p_fd->fd_cmask; VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE); error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, path); + if (error == 0) + vput(nd.ni_vp); vput(nd.ni_dvp); ASSERT_VOP_UNLOCKED(nd.ni_dvp, "symlink"); ASSERT_VOP_UNLOCKED(nd.ni_vp, "symlink"); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 2f4aa01..19c9d90 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1303,6 +1303,8 @@ symlink(p, uap) vattr.va_mode = ACCESSPERMS &~ p->p_fd->fd_cmask; VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE); error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, path); + if (error == 0) + vput(nd.ni_vp); vput(nd.ni_dvp); ASSERT_VOP_UNLOCKED(nd.ni_dvp, "symlink"); ASSERT_VOP_UNLOCKED(nd.ni_vp, "symlink"); diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index e2cd43e..2b16704 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -304,13 +304,9 @@ vop_rmdir { #% symlink dvp L L L #% symlink vpp - U - # -# XXX - note that the return vnode has already been VRELE'ed -# by the filesystem layer. To use it you must use vget, -# possibly with a further namei. -# vop_symlink { IN struct vnode *dvp; - OUT WILLRELE struct vnode **vpp; + OUT struct vnode **vpp; IN struct componentname *cnp; IN struct vattr *vap; IN char *target; |
