From e0b4edbdcc3558d3f38af8398f995c2e9f019f07 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 6 Nov 2018 15:42:44 +0100 Subject: Update to FreeBSD head 2018-11-15 Git mirror commit a18b0830c4be01b39489a891b63d6023ada6358a. Update #3472. --- freebsd/sys/sys/blist.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'freebsd/sys/sys/blist.h') diff --git a/freebsd/sys/sys/blist.h b/freebsd/sys/sys/blist.h index 22d834f7..595d3477 100644 --- a/freebsd/sys/sys/blist.h +++ b/freebsd/sys/sys/blist.h @@ -73,22 +73,20 @@ typedef uint64_t u_daddr_t; /* unsigned disk address */ */ typedef struct blmeta { - union { - daddr_t bmu_avail; /* space available under us */ - u_daddr_t bmu_bitmap; /* bitmap if we are a leaf */ - } u; + u_daddr_t bm_bitmap; /* bitmap if we are a leaf */ daddr_t bm_bighint; /* biggest contiguous block hint*/ } blmeta_t; typedef struct blist { daddr_t bl_blocks; /* area of coverage */ + daddr_t bl_avail; /* # available blocks */ u_daddr_t bl_radix; /* coverage radix */ daddr_t bl_cursor; /* next-fit search starts at */ blmeta_t bl_root[1]; /* root of radix tree */ } *blist_t; -#define BLIST_META_RADIX 16 #define BLIST_BMAP_RADIX (sizeof(u_daddr_t)*8) +#define BLIST_META_RADIX BLIST_BMAP_RADIX #define BLIST_MAX_ALLOC BLIST_BMAP_RADIX -- cgit v1.2.3