diff options
| author | David Greenman <dg@FreeBSD.org> | 1995-02-28 02:52:48 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1995-02-28 02:52:48 +0000 |
| commit | 519b3d1aa6ead2bff6a4d585bf00ed895e2b7a19 (patch) | |
| tree | 9f1cb5462ae5014d91095c62cf29fe3d96817127 | |
| parent | 2469b9a2ef31246a4d031e454c0f2670e152ec14 (diff) | |
Notes
| -rw-r--r-- | sys/kern/vfs_extattr.c | 6 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index b63f7482795a..eef1fce078e1 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.16 1994/11/04 14:41:34 davidg Exp $ + * $Id: vfs_syscalls.c,v 1.17 1995/02/13 13:45:04 davidg Exp $ */ #include <sys/param.h> @@ -938,7 +938,7 @@ unlink(p, uap, retval) if (vp->v_flag & VROOT) error = EBUSY; else - (void)vnode_pager_uncache(vp); + (void) vnode_pager_uncache(vp); } if (!error) { @@ -1854,6 +1854,8 @@ out: LEASE_CHECK(tvp, p, p->p_ucred, LEASE_WRITE); error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, tond.ni_dvp, tond.ni_vp, &tond.ni_cnd); + if (tvp && !error) + (void) vnode_pager_uncache(tvp); } else { VOP_ABORTOP(tond.ni_dvp, &tond.ni_cnd); if (tdvp == tvp) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index b63f7482795a..eef1fce078e1 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.16 1994/11/04 14:41:34 davidg Exp $ + * $Id: vfs_syscalls.c,v 1.17 1995/02/13 13:45:04 davidg Exp $ */ #include <sys/param.h> @@ -938,7 +938,7 @@ unlink(p, uap, retval) if (vp->v_flag & VROOT) error = EBUSY; else - (void)vnode_pager_uncache(vp); + (void) vnode_pager_uncache(vp); } if (!error) { @@ -1854,6 +1854,8 @@ out: LEASE_CHECK(tvp, p, p->p_ucred, LEASE_WRITE); error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, tond.ni_dvp, tond.ni_vp, &tond.ni_cnd); + if (tvp && !error) + (void) vnode_pager_uncache(tvp); } else { VOP_ABORTOP(tond.ni_dvp, &tond.ni_cnd); if (tdvp == tvp) |