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

libspl: common sysmacros.h

Browse Source 
Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #17861
This commit is contained in:
Rob Norris 2025-10-19 13:57:19 +11:00 committed by Brian Behlendorf
parent 248c7ed0d2
commit b9d2e7782f
5 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/sys/zfs_context.h
View File

@ -145,29 +145,8 @@ extern "C" {
typedef off_t loff_t;
#endif
/*
* Random stuff
*/
#define max_ncpus 64
#define boot_ncpus (sysconf(_SC_NPROCESSORS_ONLN))
/*
* Process priorities as defined by setpriority(2) and getpriority(2).
*/
#define minclsyspri 19
#define defclsyspri 0
/* Write issue taskq priority. */
#define wtqclsyspri -19
#define maxclsyspri -20
#define CPU_SEQID ((uintptr_t)pthread_self() & (max_ncpus - 1))
#define CPU_SEQID_UNSTABLE CPU_SEQID
#define NN_NUMBUF_SZ (6)
extern int highbit64(uint64_t i);
extern int lowbit64(uint64_t i);
/*
* Kernel modules
*/

5
lib/libspl/include/Makefile.am
View File

@ -61,6 +61,7 @@ libspl_sys_HEADERS = \
%D%/sys/stdtypes.h \
%D%/sys/string.h \
%D%/sys/sunddi.h \
%D%/sys/sysmacros.h \
%D%/sys/systeminfo.h \
%D%/sys/systm.h \
%D%/sys/thread.h \
@ -88,8 +89,7 @@ libspl_sys_HEADERS += \
%D%/os/linux/sys/mount.h \
%D%/os/linux/sys/param.h \
%D%/os/linux/sys/stat.h \
%D%/os/linux/sys/sysmacros.h \
%D%/os/linux/sys/vfs.h \
%D%/os/linux/sys/vfs.h
libspl_ia32_HEADERS = \
%D%/os/linux/sys/ia32/asm_linkage.h
@ -104,7 +104,6 @@ libspl_sys_HEADERS += \
%D%/os/freebsd/sys/mount.h \
%D%/os/freebsd/sys/param.h \
%D%/os/freebsd/sys/stat.h \
%D%/os/freebsd/sys/sysmacros.h \
%D%/os/freebsd/sys/vfs.h
libspl_ia32_HEADERS = \

1
lib/libspl/include/os/freebsd/sys/sysmacros.h
View File

@ -1 +0,0 @@
/* keep me */

43
lib/libspl/include/os/linux/sys/sysmacros.h → lib/libspl/include/sys/sysmacros.h
View File

@ -3,9 +3,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License, Version 1.0 only
* (the "License"). You may not use this file except in compliance
* with the License.
* Common Development and Distribution License (the "License").
* You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or https://opensource.org/licenses/CDDL-1.0.
@ -21,14 +20,26 @@
* CDDL HEADER END
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2012, 2018 by Delphix. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
*/
#ifndef _LIBSPL_SYS_SYSMACROS_H
#define _LIBSPL_SYS_SYSMACROS_H
#include <stdint.h>
#ifdef __linux__
/*
* On Linux, we need the system-provided sysmacros.h to get the makedev(),
* major() and minor() definitions for makedevice() below. FreeBSD does not
* have this header, so include_next won't find it and will abort. So, we
* protect it with a platform check.
*/
#include_next <sys/sysmacros.h>
#endif
/* common macros */
#ifndef MIN
@ -94,10 +105,22 @@
#define P2SAMEHIGHBIT_TYPED(x, y, type) \
(((type)(x) ^ (type)(y)) < ((type)(x) & (type)(y)))
#define max_ncpus 64
#define boot_ncpus (sysconf(_SC_NPROCESSORS_ONLN))
/* avoid any possibility of clashing with <stddef.h> version */
#if defined(_KERNEL) && !defined(_KMEMUSER) && !defined(offsetof)
#define offsetof(s, m) ((size_t)(&(((s *)0)->m)))
#endif
/*
* Process priorities as defined by setpriority(2) and getpriority(2).
*/
#define minclsyspri 19
#define defclsyspri 0
/* Write issue taskq priority. */
#define wtqclsyspri -19
#define maxclsyspri -20
#endif /* _LIBSPL_SYS_SYSMACROS_H */
#define CPU_SEQID ((uintptr_t)pthread_self() & (max_ncpus - 1))
#define CPU_SEQID_UNSTABLE CPU_SEQID
extern int lowbit64(uint64_t i);
extern int highbit64(uint64_t i);
#endif /* _SYS_SYSMACROS_H */

1
scripts/spdxcheck.pl
View File

@ -127,7 +127,6 @@ my $untagged_patterns = q(
include/os/freebsd/spl/sys/trace_zfs.h
include/os/freebsd/zfs/sys/zpl.h
include/os/linux/kernel/linux/page_compat.h
lib/libspl/include/os/freebsd/sys/sysmacros.h
lib/libspl/include/sys/string.h
lib/libspl/include/sys/trace_spl.h
lib/libzdb/libzdb.c