Module Name: src
Committed By: manu
Date: Thu Aug 9 07:46:18 UTC 2012
Modified Files:
src/sys/fs/puffs: puffs_vfsops.c
Log Message:
Backout previous bugfix attempt for unmounts. That changes did not
address the real problem.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/fs/puffs/puffs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_vfsops.c
diff -u src/sys/fs/puffs/puffs_vfsops.c:1.105 src/sys/fs/puffs/puffs_vfsops.c:1.106
--- src/sys/fs/puffs/puffs_vfsops.c:1.105 Fri Jul 27 07:38:44 2012
+++ src/sys/fs/puffs/puffs_vfsops.c Thu Aug 9 07:46:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vfsops.c,v 1.105 2012/07/27 07:38:44 manu Exp $ */
+/* $NetBSD: puffs_vfsops.c,v 1.106 2012/08/09 07:46:18 manu Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.105 2012/07/27 07:38:44 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.106 2012/08/09 07:46:18 manu Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -61,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: puffs_vfsops
MODULE(MODULE_CLASS_VFS, puffs, "putter");
VFS_PROTOS(puffs_vfsop);
-extern struct vfsops puffs_vfsops;
#ifndef PUFFS_PNODEBUCKETS
#define PUFFS_PNODEBUCKETS 256
@@ -321,14 +320,6 @@ puffs_vfsop_mount(struct mount *mp, cons
vfs_getnewfsid(mp);
- /*
- * Hold a reference on vfs so that the puffs module cannot be
- * unloaded while the pools items have not been freed by unmount.
- */
- mutex_enter(&vfs_list_lock);
- puffs_vfsops.vfs_refcount++;
- mutex_exit(&vfs_list_lock);
-
out:
if (error && pmp && pmp->pmp_pi)
putter_detach(pmp->pmp_pi);
@@ -457,11 +448,6 @@ puffs_vfsop_unmount(struct mount *mp, in
kmem_free(pmp->pmp_pnodehash, BUCKETALLOC(pmp->pmp_npnodehash));
kmem_free(pmp, sizeof(struct puffs_mount));
error = 0;
-
- /*
- * One less user for puffs pools
- */
- vfs_delref(&puffs_vfsops);
} else {
mutex_exit(&pmp->pmp_lock);
}
