Attachment 61308 Details for Bug 91879 – file.diff

[patch] file.diff

file.diff (text/plain), 5.67 KB, created by frank on 2006-01-16 18:50:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: frank

Created: 2006-01-16 18:50:07 UTC

Size: 5.67 KB

patch

obsolete

>Index: sys/fs/hpfs/hpfs_vnops.c
>===================================================================
>RCS file: /cvs/repos/src/sys/fs/hpfs/hpfs_vnops.c,v
>retrieving revision 1.67
>diff -u -r1.67 hpfs_vnops.c
>--- sys/fs/hpfs/hpfs_vnops.c	4 Dec 2005 10:06:04 -0000	1.67
>+++ sys/fs/hpfs/hpfs_vnops.c	16 Jan 2006 18:21:01 -0000
>@@ -600,12 +600,16 @@
> 
> 	dprintf(("hpfs_reclaim(0x%x0): \n", hp->h_no));
> 
>+	/*
>+	 * Destroy the vm object and flush associated pages.
>+	 */
>+	vnode_destroy_vobject(vp);
>+
> 	vfs_hash_remove(vp);
> 
> 	mtx_destroy(&hp->h_interlock);
> 
> 	vp->v_data = NULL;
>-	vnode_destroy_vobject(vp);
> 
> 	FREE(hp, M_HPFSNO);
> 
>Index: sys/fs/msdosfs/msdosfs_denode.c
>===================================================================
>RCS file: /cvs/repos/src/sys/fs/msdosfs/msdosfs_denode.c,v
>retrieving revision 1.90
>diff -u -r1.90 msdosfs_denode.c
>--- sys/fs/msdosfs/msdosfs_denode.c	31 Oct 2005 15:41:20 -0000	1.90
>+++ sys/fs/msdosfs/msdosfs_denode.c	16 Jan 2006 18:21:01 -0000
>@@ -549,6 +549,10 @@
> 	if (prtactive && vrefcnt(vp) != 0)
> 		vprint("msdosfs_reclaim(): pushing active", vp);
> 	/*
>+	 * Destroy the vm object and flush associated pages.
>+	 */
>+	vnode_destroy_vobject(vp);
>+	/*
> 	 * Remove the denode from its hash chain.
> 	 */
> 	vfs_hash_remove(vp);
>@@ -560,7 +564,6 @@
> #endif
> 	FREE(dep, M_MSDOSFSNODE);
> 	vp->v_data = NULL;
>-	vnode_destroy_vobject(vp);
> 
> 	return (0);
> }
>Index: sys/fs/ntfs/ntfs_vnops.c
>===================================================================
>RCS file: /cvs/repos/src/sys/fs/ntfs/ntfs_vnops.c,v
>retrieving revision 1.56
>diff -u -r1.56 ntfs_vnops.c
>--- sys/fs/ntfs/ntfs_vnops.c	4 Dec 2005 02:12:42 -0000	1.56
>+++ sys/fs/ntfs/ntfs_vnops.c	16 Jan 2006 18:21:01 -0000
>@@ -248,6 +248,11 @@
> 	if (ntfs_prtactive && vrefcnt(vp) != 0)
> 		vprint("ntfs_reclaim: pushing active", vp);
> 
>+	/*
>+	 * Destroy the vm object and flush associated pages.
>+	 */
>+	vnode_destroy_vobject(vp);
>+
> 	if ((error = ntfs_ntget(ip)) != 0)
> 		return (error);
> 	
>@@ -255,7 +260,6 @@
> 	ntfs_frele(fp);
> 	ntfs_ntput(ip);
> 	vp->v_data = NULL;
>-	vnode_destroy_vobject(vp);
> 
> 	return (0);
> }
>Index: sys/fs/nwfs/nwfs_node.c
>===================================================================
>RCS file: /cvs/repos/src/sys/fs/nwfs/nwfs_node.c,v
>retrieving revision 1.37
>diff -u -r1.37 nwfs_node.c
>--- sys/fs/nwfs/nwfs_node.c	31 Oct 2005 15:41:20 -0000	1.37
>+++ sys/fs/nwfs/nwfs_node.c	16 Jan 2006 18:21:01 -0000
>@@ -255,6 +255,11 @@
> 	struct thread *td = ap->a_td;
> 	
> 	NCPVNDEBUG("%s,%d\n", np->n_name, vrefcnt(vp));
>+	/*
>+	 * Destroy the vm object and flush associated pages.
>+	 */
>+	vnode_destroy_vobject(vp);
>+
> 	if (np->n_flag & NREFPARENT) {
> 		np->n_flag &= ~NREFPARENT;
> 		if (nwfs_lookupnp(nmp, np->n_parent, td, &dnp) == 0) {
>@@ -270,7 +275,6 @@
> 		nmp->n_root = NULL;
> 	}
> 	vp->v_data = NULL;
>-	vnode_destroy_vobject(vp);
> 	FREE(np, M_NWNODE);
> 	if (dvp) {
> 		vrele(dvp);
>Index: sys/fs/smbfs/smbfs_node.c
>===================================================================
>RCS file: /cvs/repos/src/sys/fs/smbfs/smbfs_node.c,v
>retrieving revision 1.29
>diff -u -r1.29 smbfs_node.c
>--- sys/fs/smbfs/smbfs_node.c	31 Oct 2005 15:41:21 -0000	1.29
>+++ sys/fs/smbfs/smbfs_node.c	16 Jan 2006 18:21:01 -0000
>@@ -319,6 +319,10 @@
> 	KASSERT((np->n_flag & NOPEN) == 0, ("file not closed before reclaim"));
> 
> 	smbfs_hash_lock(smp, td);
>+	/*
>+	 * Destroy the vm object and flush associated pages.
>+	 */
>+	vnode_destroy_vobject(vp);
> 
> 	dvp = (np->n_parent && (np->n_flag & NREFPARENT)) ?
> 	    np->n_parent : NULL;
>@@ -330,7 +334,6 @@
> 		smp->sm_root = NULL;
> 	}
> 	vp->v_data = NULL;
>-	vnode_destroy_vobject(vp);
> 	smbfs_hash_unlock(smp, td);
> 	if (np->n_name)
> 		smbfs_name_free(np->n_name);
>Index: sys/fs/udf/udf_vnops.c
>===================================================================
>RCS file: /cvs/repos/src/sys/fs/udf/udf_vnops.c,v
>retrieving revision 1.59
>diff -u -r1.59 udf_vnops.c
>--- sys/fs/udf/udf_vnops.c	31 Oct 2005 15:41:21 -0000	1.59
>+++ sys/fs/udf/udf_vnops.c	16 Jan 2006 18:21:01 -0000
>@@ -965,6 +965,11 @@
> 	vp = a->a_vp;
> 	unode = VTON(vp);
> 
>+	/*
>+	 * Destroy the vm object and flush associated pages.
>+	 */
>+	vnode_destroy_vobject(vp);
>+
> 	if (unode != NULL) {
> 		vfs_hash_remove(vp);
> 
>@@ -973,7 +978,6 @@
> 		uma_zfree(udf_zone_node, unode);
> 		vp->v_data = NULL;
> 	}
>-	vnode_destroy_vobject(vp);
> 
> 	return (0);
> }
>Index: sys/isofs/cd9660/cd9660_node.c
>===================================================================
>RCS file: /cvs/repos/src/sys/isofs/cd9660/cd9660_node.c,v
>retrieving revision 1.54
>diff -u -r1.54 cd9660_node.c
>--- sys/isofs/cd9660/cd9660_node.c	14 Mar 2005 13:22:41 -0000	1.54
>+++ sys/isofs/cd9660/cd9660_node.c	16 Jan 2006 18:21:17 -0000
>@@ -98,6 +98,10 @@
> 	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 @@
> 		vrele(ip->i_mnt->im_devvp);
> 	FREE(vp->v_data, M_ISOFSNODE);
> 	vp->v_data = NULL;
>-	vnode_destroy_vobject(vp);
> 	return (0);
> }
> 
>Index: sys/nfsclient/nfs_node.c
>===================================================================
>RCS file: /cvs/repos/src/sys/nfsclient/nfs_node.c,v
>retrieving revision 1.78
>diff -u -r1.78 nfs_node.c
>--- sys/nfsclient/nfs_node.c	27 Jul 2005 15:05:31 -0000	1.78
>+++ sys/nfsclient/nfs_node.c	16 Jan 2006 18:21:17 -0000
>@@ -211,6 +211,11 @@
> 	if (prtactive && vrefcnt(vp) != 0)
> 		vprint("nfs_reclaim: pushing active", vp);
> 
>+	/*
>+	 * Destroy the vm object and flush associated pages.
>+	 */
>+	vnode_destroy_vobject(vp);
>+
> 	vfs_hash_remove(vp);
> 
> 	/*
>@@ -232,6 +237,5 @@
> 
> 	uma_zfree(nfsnode_zone, vp->v_data);
> 	vp->v_data = NULL;
>-	vnode_destroy_vobject(vp);
> 	return (0);
> }

Actions: View | Diff

Attachments on bug 91879: 61308