Module Name: src
Committed By: pooka
Date: Tue Mar 22 15:16:23 UTC 2011
Modified Files:
src/sys/kern: subr_pool.c vfs_lookup.c
src/sys/rump/librump/rumpkern: rump.c
Log Message:
pnbuf_cache is used all over the place outside of vfs, so put it
in one place to avoid many definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.131 -r1.132 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.233 -r1.234 src/sys/rump/librump/rumpkern/rump.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/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.188 src/sys/kern/subr_pool.c:1.189
--- src/sys/kern/subr_pool.c:1.188 Mon Jan 17 07:36:58 2011
+++ src/sys/kern/subr_pool.c Tue Mar 22 15:16:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.188 2011/01/17 07:36:58 uebayasi Exp $ */
+/* $NetBSD: subr_pool.c,v 1.189 2011/03/22 15:16:23 pooka Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.188 2011/01/17 07:36:58 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.189 2011/03/22 15:16:23 pooka Exp $");
#include "opt_ddb.h"
#include "opt_pool.h"
@@ -182,6 +182,8 @@
static struct pool cache_pool;
static struct pool cache_cpu_pool;
+pool_cache_t pnbuf_cache; /* pathname buffer cache */
+
/* List of all caches. */
TAILQ_HEAD(,pool_cache) pool_cache_head =
TAILQ_HEAD_INITIALIZER(pool_cache_head);
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.131 src/sys/kern/vfs_lookup.c:1.132
--- src/sys/kern/vfs_lookup.c:1.131 Tue Jan 4 07:43:42 2011
+++ src/sys/kern/vfs_lookup.c Tue Mar 22 15:16:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.131 2011/01/04 07:43:42 dholland Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.132 2011/03/22 15:16:23 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.131 2011/01/04 07:43:42 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.132 2011/03/22 15:16:23 pooka Exp $");
#include "opt_magiclinks.h"
@@ -63,8 +63,6 @@
int vfs_magiclinks = MAGICLINKS;
-pool_cache_t pnbuf_cache; /* pathname buffer cache */
-
/*
* Substitute replacement text for 'magic' strings in symlinks.
* Returns 0 if successful, and returns non-zero if an error
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.233 src/sys/rump/librump/rumpkern/rump.c:1.234
--- src/sys/rump/librump/rumpkern/rump.c:1.233 Mon Mar 21 16:41:08 2011
+++ src/sys/rump/librump/rumpkern/rump.c Tue Mar 22 15:16:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.233 2011/03/21 16:41:08 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.234 2011/03/22 15:16:23 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.233 2011/03/21 16:41:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.234 2011/03/22 15:16:23 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -51,6 +51,7 @@
#include <sys/ksyms.h>
#include <sys/msgbuf.h>
#include <sys/module.h>
+#include <sys/namei.h>
#include <sys/once.h>
#include <sys/percpu.h>
#include <sys/pipe.h>
@@ -125,7 +126,6 @@
/*
* Make sure pnbuf_cache is available even without vfs
*/
-struct pool_cache *pnbuf_cache;
int rump_initpnbufpool(void);
int rump_initpnbufpool(void)
{
