Module Name: src
Committed By: dholland
Date: Tue Sep 15 15:01:03 UTC 2015
Modified Files:
src/sys/ufs/lfs: ulfs_extern.h ulfs_vfsops.c
Log Message:
Kill off the ulfs_direct_cache pool.
We no longer allocate temporary struct directs, so we don't need a
pool for them.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/ufs/lfs/ulfs_extern.h
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/lfs/ulfs_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/ufs/lfs/ulfs_extern.h
diff -u src/sys/ufs/lfs/ulfs_extern.h:1.17 src/sys/ufs/lfs/ulfs_extern.h:1.18
--- src/sys/ufs/lfs/ulfs_extern.h:1.17 Tue Sep 15 15:00:32 2015
+++ src/sys/ufs/lfs/ulfs_extern.h Tue Sep 15 15:01:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_extern.h,v 1.17 2015/09/15 15:00:32 dholland Exp $ */
+/* $NetBSD: ulfs_extern.h,v 1.18 2015/09/15 15:01:03 dholland Exp $ */
/* from NetBSD: ufs_extern.h,v 1.72 2012/05/09 00:21:18 riastradh Exp */
/*-
@@ -58,8 +58,6 @@ struct uio;
struct vattr;
struct vnode;
-extern pool_cache_t ulfs_direct_cache; /* memory pool for lfs_directs */
-
__BEGIN_DECLS
#define ulfs_abortop genfs_abortop
int ulfs_access(void *);
Index: src/sys/ufs/lfs/ulfs_vfsops.c
diff -u src/sys/ufs/lfs/ulfs_vfsops.c:1.10 src/sys/ufs/lfs/ulfs_vfsops.c:1.11
--- src/sys/ufs/lfs/ulfs_vfsops.c:1.10 Tue Sep 1 06:16:59 2015
+++ src/sys/ufs/lfs/ulfs_vfsops.c Tue Sep 15 15:01:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vfsops.c,v 1.10 2015/09/01 06:16:59 dholland Exp $ */
+/* $NetBSD: ulfs_vfsops.c,v 1.11 2015/09/15 15:01:03 dholland Exp $ */
/* from NetBSD: ufs_vfsops.c,v 1.52 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.10 2015/09/01 06:16:59 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.11 2015/09/15 15:01:03 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -70,8 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.
/* how many times ulfs_init() was called */
static int ulfs_initcount = 0;
-pool_cache_t ulfs_direct_cache;
-
/*
* Make a filesystem operational.
* Nothing to do at the moment.
@@ -247,9 +245,6 @@ ulfs_init(void)
if (ulfs_initcount++ > 0)
return;
- ulfs_direct_cache = pool_cache_init(sizeof(struct lfs_direct), 0, 0, 0,
- "ulfsdir", NULL, IPL_NONE, NULL, NULL, NULL);
-
#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
lfs_dqinit();
#endif
@@ -282,7 +277,6 @@ ulfs_done(void)
#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
lfs_dqdone();
#endif
- pool_cache_destroy(ulfs_direct_cache);
#ifdef LFS_DIRHASH
ulfsdirhash_done();
#endif