Module Name: src
Committed By: riz
Date: Fri Mar 2 16:31:44 UTC 2012
Modified Files:
src/sys/arch/i386/conf [netbsd-6]: ALL
src/sys/ufs/chfs [netbsd-6]: chfs_inode.h chfs_malloc.c chfs_pool.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #63):
sys/ufs/chfs/chfs_inode.h: revision 1.2
sys/ufs/chfs/chfs_malloc.c: revision 1.2
sys/arch/i386/conf/ALL: revision 1.333
sys/ufs/chfs/chfs_pool.c: revision 1.2
Make this compile again. From Paul Fleischer.
Add Chip File System.
To generate a diff of this commit:
cvs rdiff -u -r1.332 -r1.332.2.1 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/ufs/chfs/chfs_inode.h \
src/sys/ufs/chfs/chfs_malloc.c src/sys/ufs/chfs/chfs_pool.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/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.332 src/sys/arch/i386/conf/ALL:1.332.2.1
--- src/sys/arch/i386/conf/ALL:1.332 Fri Feb 3 23:37:20 2012
+++ src/sys/arch/i386/conf/ALL Fri Mar 2 16:31:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.332 2012/02/03 23:37:20 christos Exp $
+# $NetBSD: ALL,v 1.332.2.1 2012/03/02 16:31:44 riz Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.332 $"
+#ident "ALL-$Revision: 1.332.2.1 $"
maxusers 64 # estimated number of users
@@ -189,6 +189,7 @@ file-system FILECORE # Acorn filecore f
file-system ADOSFS # AmigaDOS file system
file-system NILFS # experimental - NTT's NiLFS(2)
file-system V7FS # 7th Edition(V7) File System
+file-system CHFS # Chip File System
# File system options
options QUOTA # legacy UFS quotas
Index: src/sys/ufs/chfs/chfs_inode.h
diff -u src/sys/ufs/chfs/chfs_inode.h:1.1 src/sys/ufs/chfs/chfs_inode.h:1.1.4.1
--- src/sys/ufs/chfs/chfs_inode.h:1.1 Thu Nov 24 15:51:31 2011
+++ src/sys/ufs/chfs/chfs_inode.h Fri Mar 2 16:31:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_inode.h,v 1.1 2011/11/24 15:51:31 ahoka Exp $ */
+/* $NetBSD: chfs_inode.h,v 1.1.4.1 2012/03/02 16:31:44 riz Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -42,6 +42,7 @@
struct chfs_inode
{
+ struct genfs_node gnode;
kmutex_t inode_lock; /* lock the fields of chfs_inode */
LIST_ENTRY(chfs_inode) hash_entry; /* Hash chain. */
Index: src/sys/ufs/chfs/chfs_malloc.c
diff -u src/sys/ufs/chfs/chfs_malloc.c:1.1 src/sys/ufs/chfs/chfs_malloc.c:1.1.4.1
--- src/sys/ufs/chfs/chfs_malloc.c:1.1 Thu Nov 24 15:51:31 2011
+++ src/sys/ufs/chfs/chfs_malloc.c Fri Mar 2 16:31:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_malloc.c,v 1.1 2011/11/24 15:51:31 ahoka Exp $ */
+/* $NetBSD: chfs_malloc.c,v 1.1.4.1 2012/03/02 16:31:44 riz Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -45,7 +45,7 @@ pool_cache_t chfs_tmp_dnode_cache;
pool_cache_t chfs_tmp_dnode_info_cache;
int
-chfs_alloc_pool_caches()
+chfs_alloc_pool_caches(void)
{
chfs_vnode_cache = pool_cache_init(
sizeof(struct chfs_vnode_cache),
@@ -118,7 +118,7 @@ err_vnode:
}
void
-chfs_destroy_pool_caches()
+chfs_destroy_pool_caches(void)
{
if (chfs_vnode_cache)
pool_cache_destroy(chfs_vnode_cache);
@@ -293,7 +293,7 @@ chfs_free_dirent(struct chfs_dirent *dir
}
struct chfs_full_dnode*
-chfs_alloc_full_dnode()
+chfs_alloc_full_dnode(void)
{
struct chfs_full_dnode *ret;
ret = kmem_alloc(sizeof(struct chfs_full_dnode), KM_SLEEP);
@@ -307,7 +307,7 @@ chfs_free_full_dnode(struct chfs_full_dn
}
struct chfs_flash_vnode*
-chfs_alloc_flash_vnode()
+chfs_alloc_flash_vnode(void)
{
struct chfs_flash_vnode *ret;
ret = pool_cache_get(chfs_flash_vnode_cache, 0);
@@ -321,7 +321,7 @@ chfs_free_flash_vnode(struct chfs_flash_
}
struct chfs_flash_dirent_node*
-chfs_alloc_flash_dirent()
+chfs_alloc_flash_dirent(void)
{
struct chfs_flash_dirent_node *ret;
ret = pool_cache_get(chfs_flash_dirent_cache, 0);
@@ -335,7 +335,7 @@ chfs_free_flash_dirent(struct chfs_flash
}
struct chfs_flash_data_node*
-chfs_alloc_flash_dnode()
+chfs_alloc_flash_dnode(void)
{
struct chfs_flash_data_node *ret;
ret = pool_cache_get(chfs_flash_dnode_cache, 0);
@@ -350,7 +350,7 @@ chfs_free_flash_dnode(struct chfs_flash_
struct chfs_node_frag*
-chfs_alloc_node_frag()
+chfs_alloc_node_frag(void)
{
struct chfs_node_frag *ret;
ret = pool_cache_get(chfs_node_frag_cache, 0);
@@ -365,7 +365,7 @@ chfs_free_node_frag(struct chfs_node_fra
}
struct chfs_tmp_dnode *
-chfs_alloc_tmp_dnode()
+chfs_alloc_tmp_dnode(void)
{
struct chfs_tmp_dnode *ret;
ret = pool_cache_get(chfs_tmp_dnode_cache, 0);
@@ -380,7 +380,7 @@ chfs_free_tmp_dnode(struct chfs_tmp_dnod
}
struct chfs_tmp_dnode_info *
-chfs_alloc_tmp_dnode_info()
+chfs_alloc_tmp_dnode_info(void)
{
struct chfs_tmp_dnode_info *ret;
ret = pool_cache_get(chfs_tmp_dnode_info_cache, 0);
Index: src/sys/ufs/chfs/chfs_pool.c
diff -u src/sys/ufs/chfs/chfs_pool.c:1.1 src/sys/ufs/chfs/chfs_pool.c:1.1.4.1
--- src/sys/ufs/chfs/chfs_pool.c:1.1 Thu Nov 24 15:51:31 2011
+++ src/sys/ufs/chfs/chfs_pool.c Fri Mar 2 16:31:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_pool.c,v 1.1 2011/11/24 15:51:31 ahoka Exp $ */
+/* $NetBSD: chfs_pool.c,v 1.1.4.1 2012/03/02 16:31:44 riz Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -50,9 +50,6 @@
void * chfs_pool_page_alloc(struct pool *, int);
void chfs_pool_page_free(struct pool *, void *);
-extern void* pool_page_alloc_nointr(struct pool *, int);
-extern void pool_page_free_nointr(struct pool *, void *);
-
/* --------------------------------------------------------------------- */
struct pool_allocator chfs_pool_allocator = {
@@ -104,7 +101,7 @@ chfs_pool_page_alloc(struct pool *pp, in
atomic_dec_uint(&chmp->chm_pages_used);
return NULL;
}
- page = pool_page_alloc_nointr(pp, flags | PR_WAITOK);
+ page = pool_get(pp, flags | PR_WAITOK);
if (page == NULL) {
atomic_dec_uint(&chmp->chm_pages_used);
}
@@ -125,7 +122,7 @@ chfs_pool_page_free(struct pool *pp, voi
chmp = chpp->chp_mount;
atomic_dec_uint(&chmp->chm_pages_used);
- pool_page_free_nointr(pp, v);
+ pool_put(pp,v);
}
/* --------------------------------------------------------------------- */
