From ed5a2ac45cdb0e733041a9bdb3169b066e34230b Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 25 May 2008 22:34:17 +0000
Subject: [PATCH] Fix namespace collision after src/sys/sys/file.h:1.78.

---
 sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c    | 2 +-
 sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c    | 2 +-
 .../contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h     | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
index 411ed46e13d7..a2f4614fed87 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
@@ -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);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
index 5da1f96c85c5..1e1f0ee93068 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
@@ -1103,7 +1103,7 @@ spa_init(int mode)
 
 	spa_mode = mode;
 
-	refcount_init();
+	refcount_sysinit();
 	unique_init();
 	zio_init();
 	dmu_init();
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
index 4de1cae12fe7..c64c6627f783 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
@@ -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 */