Module Name: src
Committed By: manu
Date: Fri Jul 27 07:25:56 UTC 2012
Modified Files:
src/sys/fs/puffs: puffs_vfsops.c
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 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.103 src/sys/fs/puffs/puffs_vfsops.c:1.104
--- src/sys/fs/puffs/puffs_vfsops.c:1.103 Sun Jul 22 17:40:46 2012
+++ src/sys/fs/puffs/puffs_vfsops.c Fri Jul 27 07:25:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vfsops.c,v 1.103 2012/07/22 17:40:46 manu Exp $ */
+/* $NetBSD: puffs_vfsops.c,v 1.104 2012/07/27 07:25:56 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.103 2012/07/22 17:40:46 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.104 2012/07/27 07:25:56 manu Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -61,6 +61,7 @@ __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
@@ -320,6 +321,14 @@ 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);
@@ -448,6 +457,11 @@ 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);
}
