From 2561820ec8767a55c38edb3e3280e21c89eeeff6 Mon Sep 17 00:00:00 2001 From: bp Date: Sun, 11 Mar 2001 11:51:42 +0000 Subject: [PATCH] Do not kill vnodes after rename. This can cause deadlocks in the deadfs. Noticed by: Matthew N. Dodd --- sys/fs/nwfs/nwfs_vnops.c | 8 ++------ sys/nwfs/nwfs_vnops.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c index 1c65b4c182da..e7e6b720b26e 100644 --- a/sys/fs/nwfs/nwfs_vnops.c +++ b/sys/fs/nwfs/nwfs_vnops.c @@ -576,13 +576,9 @@ nwfs_rename(ap) vrele(fvp); nwfs_attr_cacheremove(fdvp); nwfs_attr_cacheremove(tdvp); - /* - * Need to get rid of old vnodes, because netware will change - * file id on rename - */ - vgone(fvp); + nwfs_attr_cacheremove(fvp); if (tvp) - vgone(tvp); + nwfs_attr_cacheremove(tvp); /* * Kludge: Map ENOENT => 0 assuming that it is a reply to a retry. */ diff --git a/sys/nwfs/nwfs_vnops.c b/sys/nwfs/nwfs_vnops.c index 1c65b4c182da..e7e6b720b26e 100644 --- a/sys/nwfs/nwfs_vnops.c +++ b/sys/nwfs/nwfs_vnops.c @@ -576,13 +576,9 @@ nwfs_rename(ap) vrele(fvp); nwfs_attr_cacheremove(fdvp); nwfs_attr_cacheremove(tdvp); - /* - * Need to get rid of old vnodes, because netware will change - * file id on rename - */ - vgone(fvp); + nwfs_attr_cacheremove(fvp); if (tvp) - vgone(tvp); + nwfs_attr_cacheremove(tvp); /* * Kludge: Map ENOENT => 0 assuming that it is a reply to a retry. */