diff options
| author | pjd <pjd@FreeBSD.org> | 2008-05-25 22:34:17 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2008-05-25 22:34:17 +0000 |
| commit | d546148e70c16bd8528c88bc8ac0e806668f7ab4 (patch) | |
| tree | ab44ac961c5ca994048e3975e6ca01f7942d80ed | |
| parent | e75a451fc0dd76f9a62f66c92a86d75984c14099 (diff) | |
| download | FreeBSD-src-d546148e70c16bd8528c88bc8ac0e806668f7ab4.zip FreeBSD-src-d546148e70c16bd8528c88bc8ac0e806668f7ab4.tar.gz | |
Fix namespace collision after src/sys/sys/file.h:1.78.
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 411ed46..a2f4614 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 5da1f96..1e1f0ee 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 4de1cae..c64c662 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 */ |
