summaryrefslogtreecommitdiffstats
path: root/sys/isofs/cd9660
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2006-01-17 17:29:03 +0000
committeralfred <alfred@FreeBSD.org>2006-01-17 17:29:03 +0000
commita0282ebc04163163dc358c05c9071f8b0f17a9eb (patch)
tree8c53b5780d1f21ba97c11f102413f8370e4d4ca0 /sys/isofs/cd9660
parent7f6555d455f978875b3f40b757762978fed9e05c (diff)
downloadFreeBSD-src-a0282ebc04163163dc358c05c9071f8b0f17a9eb.zip
FreeBSD-src-a0282ebc04163163dc358c05c9071f8b0f17a9eb.tar.gz
I ran into an nfs client panic a couple of times in a row over the
last few days. I tracked it down to the fact that nfs_reclaim() is setting vp->v_data to NULL _before_ calling vnode_destroy_object(). After silence from the mailing list I checked further and discovered that ufs_reclaim() is unique among FreeBSD filesystems for calling vnode_destroy_object() early, long before tossing v_data or much of anything else, for that matter. The rest, including NFS, appear to be identical, as if they were just clones of one original routine. The enclosed patch fixes all file systems in essentially the same way, by moving the call to vnode_destroy_object() to early in the routine (before the call to vfs_hash_remove(), if any). I have only tested NFS, but I've now run for over eighteen hours with the patch where I wouldn't get past four or five without it. Submitted by: Frank Mayhar Requested by: Mohan Srinivasan MFC After: 1 week
Diffstat (limited to 'sys/isofs/cd9660')
-rw-r--r--sys/isofs/cd9660/cd9660_node.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 8d281de..69e1043 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -98,6 +98,10 @@ cd9660_reclaim(ap)
if (prtactive && vrefcnt(vp) != 0)
vprint("cd9660_reclaim: pushing active", vp);
/*
+ * Destroy the vm object and flush associated pages.
+ */
+ vnode_destroy_vobject(vp);
+ /*
* Remove the inode from its hash chain.
*/
vfs_hash_remove(vp);
@@ -109,7 +113,6 @@ cd9660_reclaim(ap)
vrele(ip->i_mnt->im_devvp);
FREE(vp->v_data, M_ISOFSNODE);
vp->v_data = NULL;
- vnode_destroy_vobject(vp);
return (0);
}
OpenPOWER on IntegriCloud