d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix namespace collision after src/sys/sys/file.h:1.78.

Browse Source
This commit is contained in:
Pawel Jakub Dawidek 2008-05-25 22:34:17 +00:00
parent 12ed81c06a
commit ed5a2ac45c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
View File

@ -42,7 +42,7 @@ static kmem_cache_t *reference_cache;
static kmem_cache_t *reference_history_cache;
void
refcount_init(void)
refcount_sysinit(void)
{
reference_cache = kmem_cache_create("reference_cache",
sizeof (reference_t), 0, NULL, NULL, NULL, NULL, NULL, 0);

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
View File

@ -1103,7 +1103,7 @@ spa_init(int mode)
spa_mode = mode;
refcount_init();
refcount_sysinit();
unique_init();
zio_init();
dmu_init();

5
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
View File

@ -28,6 +28,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include_next <sys/refcount.h>
#include <sys/list.h>
#include <sys/zfs_context.h>
@ -70,7 +71,7 @@ int64_t refcount_remove(refcount_t *rc, void *holder_tag);
int64_t refcount_add_many(refcount_t *rc, uint64_t number, void *holder_tag);
int64_t refcount_remove_many(refcount_t *rc, uint64_t number, void *holder_tag);
void refcount_init(void);
void refcount_sysinit(void);
void refcount_fini(void);
#else /* DEBUG */
@ -91,7 +92,7 @@ typedef struct refcount {
#define refcount_remove_many(rc, number, holder) \
atomic_add_64_nv(&(rc)->rc_count, -number)
#define refcount_init()
#define refcount_sysinit()
#define refcount_fini()
#endif /* DEBUG */