Module Name: src Committed By: christos Date: Tue Feb 28 02:48:39 UTC 2012
Modified Files: src/sys/ufs/chfs: chfs_inode.h chfs_malloc.c chfs_pool.c Log Message: Make this compile again. From Paul Fleischer. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 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/ufs/chfs/chfs_inode.h diff -u src/sys/ufs/chfs/chfs_inode.h:1.1 src/sys/ufs/chfs/chfs_inode.h:1.2 --- src/sys/ufs/chfs/chfs_inode.h:1.1 Thu Nov 24 10:51:31 2011 +++ src/sys/ufs/chfs/chfs_inode.h Mon Feb 27 21:48:39 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.2 2012/02/28 02:48:39 christos 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.2 --- src/sys/ufs/chfs/chfs_malloc.c:1.1 Thu Nov 24 10:51:31 2011 +++ src/sys/ufs/chfs/chfs_malloc.c Mon Feb 27 21:48:39 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.2 2012/02/28 02:48:39 christos 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.2 --- src/sys/ufs/chfs/chfs_pool.c:1.1 Thu Nov 24 10:51:31 2011 +++ src/sys/ufs/chfs/chfs_pool.c Mon Feb 27 21:48:39 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.2 2012/02/28 02:48:39 christos 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); } /* --------------------------------------------------------------------- */