c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move range_tree, btree, highbit64 to common code

Browse Source 
Break out the range_tree, btree, and highbit64/lowbit64 code from kernel
space into shared kernel and userspace code.  This is needed for the
updated `zpool status -vv` error byte range reporting that will be
coming in a future commit.  That commit needs the range_tree code in
kernel and userspace.

Reviewed-by: Rob Norris <robn@despairlabs.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #18133
This commit is contained in:
Tony Hutter
2026-02-22 11:43:51 -08:00
committed by GitHub
parent 168023b603
commit d2f5cb3a50
15 changed files with 117 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libzpool/Makefile.am
+9 -2
View File
@@ -74,7 +74,6 @@ nodist_libzpool_la_SOURCES = \
module/zfs/bpobj.c \
module/zfs/bptree.c \
module/zfs/bqueue.c \
module/zfs/btree.c \
module/zfs/brt.c \
module/zfs/dbuf.c \
module/zfs/dbuf_stats.c \
@@ -119,7 +118,6 @@ nodist_libzpool_la_SOURCES = \
module/zfs/multilist.c \
module/zfs/objlist.c \
module/zfs/pathname.c \
module/zfs/range_tree.c \
module/zfs/refcount.c \
module/zfs/rrwlock.c \
module/zfs/sa.c \
@@ -196,6 +194,15 @@ nodist_libzpool_la_SOURCES = \
module/zfs/zrlock.c \
module/zfs/zthr.c
# Special case:
#
# We need to include btree.c and range_tree.c as SOURCES rather than
# LIBADD'ing them. This is because LIBADD'ing them will add their symbols to
# the libzpool API, which we do not want at this time.
nodist_libzpool_la_SOURCES += \
module/zfs/btree.c \
module/zfs/range_tree.c
libzpool_la_LIBADD = \
libicp.la \
libnvpair.la \
lib/libzpool/kernel.c
-28
View File
@@ -315,34 +315,6 @@ delay(clock_t ticks)
(void) poll(0, 0, ticks * (1000 / hz));
}
/*
* Find highest one bit set.
* Returns bit number + 1 of highest bit that is set, otherwise returns 0.
* The __builtin_clzll() function is supported by both GCC and Clang.
*/
int
highbit64(uint64_t i)
{
if (i == 0)
return (0);
return (NBBY * sizeof (uint64_t) - __builtin_clzll(i));
}
/*
* Find lowest one bit set.
* Returns bit number + 1 of lowest bit that is set, otherwise returns 0.
* The __builtin_ffsll() function is supported by both GCC and Clang.
*/
int
lowbit64(uint64_t i)
{
if (i == 0)
return (0);
return (__builtin_ffsll(i));
}
int
ddi_strtoull(const char *str, char **nptr, int base, u_longlong_t *result)
{