28c28
< __FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_key_cache.c 267992 2014-06-28 03:56:17Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_key_cache.c 293306 2016-01-07 05:47:34Z allanjude $");
30a31
> #ifdef _KERNEL
33d33
< #include <sys/queue.h>
35a36,37
> #endif /* _KERNEL */
> #include <sys/queue.h>
41a44
> #ifdef _KERNEL
59c62
< #define G_ELI_KEY_MAGIC 0xe11341c
---
> #endif /* _KERNEL */
61,75d63
< struct g_eli_key {
< /* Key value, must be first in the structure. */
< uint8_t gek_key[G_ELI_DATAKEYLEN];
< /* Magic. */
< int gek_magic;
< /* Key number. */
< uint64_t gek_keyno;
< /* Reference counter. */
< int gek_count;
< /* Keeps keys sorted by most recent use. */
< TAILQ_ENTRY(g_eli_key) gek_next;
< /* Keeps keys sorted by number. */
< RB_ENTRY(g_eli_key) gek_link;
< };
<
87,90c75
< RB_PROTOTYPE(g_eli_key_tree, g_eli_key, gek_link, g_eli_key_cmp);
< RB_GENERATE(g_eli_key_tree, g_eli_key, gek_link, g_eli_key_cmp);
<
< static void
---
> void
112a98,101
> #ifdef _KERNEL
> RB_PROTOTYPE(g_eli_key_tree, g_eli_key, gek_link, g_eli_key_cmp);
> RB_GENERATE(g_eli_key_tree, g_eli_key, gek_link, g_eli_key_cmp);
>
352a342
> #endif /* _KERNEL */