diff options
author | eivind <eivind@FreeBSD.org> | 1999-11-12 03:34:28 +0000 |
---|---|---|
committer | eivind <eivind@FreeBSD.org> | 1999-11-12 03:34:28 +0000 |
commit | 21fff7b1c21bef91f4e2371aa79dee6d9c899b3d (patch) | |
tree | bbd7a274a33855ba0b75b1c22be91fb6dfc52472 /sys/kern | |
parent | 9a30e94971558bbe2bf2f4450cfeb7f8dc8b5e89 (diff) | |
download | FreeBSD-src-21fff7b1c21bef91f4e2371aa79dee6d9c899b3d.zip FreeBSD-src-21fff7b1c21bef91f4e2371aa79dee6d9c899b3d.tar.gz |
Remove WILLRELE from VOP_RENAME
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/vfs_extattr.c | 6 | ||||
-rw-r--r-- | sys/kern/vfs_syscalls.c | 6 | ||||
-rw-r--r-- | sys/kern/vnode_if.src | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index c1f21e7..62252b4 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -1142,6 +1142,9 @@ mknod(p, uap) } else { error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + if (error == 0) { + vput(nd.ni_vp); + } vput(nd.ni_dvp); } } else { @@ -1197,6 +1200,9 @@ mkfifo(p, uap) vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ p->p_fd->fd_cmask; VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE); error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + if (error == 0) { + vput(nd.ni_vp); + } vput(nd.ni_dvp); return (error); } diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index c1f21e7..62252b4 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1142,6 +1142,9 @@ mknod(p, uap) } else { error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + if (error == 0) { + vput(nd.ni_vp); + } vput(nd.ni_dvp); } } else { @@ -1197,6 +1200,9 @@ mkfifo(p, uap) vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ p->p_fd->fd_cmask; VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE); error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + if (error == 0) { + vput(nd.ni_vp); + } vput(nd.ni_dvp); return (error); } diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index b2c414a..e2cd43e 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -109,7 +109,7 @@ vop_whiteout { # vop_mknod { IN struct vnode *dvp; - OUT WILLRELE struct vnode **vpp; + OUT struct vnode **vpp; IN struct componentname *cnp; IN struct vattr *vap; }; |