From 32b5c5026deaf5af17f9b2759ca5328c8420f2f8 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 3 Nov 2004 22:07:21 +0000 Subject: [PATCH] Remove incorrect cache_purge() calls in *_rmdir() (OLD API). These could result in a namecache mountpoint entry losing its vnode association under the new API. Panic-Reported-by: Stu --- sys/vfs/msdosfs/msdosfs_vnops.c | 3 +-- sys/vfs/nwfs/nwfs_vnops.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/vfs/msdosfs/msdosfs_vnops.c b/sys/vfs/msdosfs/msdosfs_vnops.c index caaa04c915..fd743c5b6c 100644 --- a/sys/vfs/msdosfs/msdosfs_vnops.c +++ b/sys/vfs/msdosfs/msdosfs_vnops.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.19 2004/10/12 19:21:00 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.20 2004/11/03 22:07:21 dillon Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -1456,7 +1456,6 @@ msdosfs_rmdir(struct vop_rmdir_args *ap) * directory. Since dos filesystems don't do this we just purge * the name cache. */ - cache_purge(dvp); VOP_UNLOCK(dvp, 0, td); /* * Truncate the directory that is being deleted. diff --git a/sys/vfs/nwfs/nwfs_vnops.c b/sys/vfs/nwfs/nwfs_vnops.c index 8c6030184c..995bee2be2 100644 --- a/sys/vfs/nwfs/nwfs_vnops.c +++ b/sys/vfs/nwfs/nwfs_vnops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_vnops.c,v 1.6.2.3 2001/03/14 11:26:59 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.18 2004/10/12 19:21:05 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.19 2004/11/03 22:07:21 dillon Exp $ */ #include #include @@ -661,7 +661,6 @@ nwfs_rmdir(struct vop_rmdir_args *ap) error = ENOTEMPTY; dnp->n_flag |= NMODIFIED; nwfs_attr_cacheremove(dvp); - cache_purge(dvp); cache_purge(vp); return (error); } -- 2.41.0