From 52cf8eac428effa920772b24d58ece86a5a7a14e Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Mon, 25 Aug 2025 22:00:24 +1000 Subject: [PATCH] libspl: move cred definitions from zfs_context.h Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #17861 --- include/sys/zfs_context.h | 15 --------------- lib/libspl/include/sys/cred.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index 6f7ae6b06..e7d164a17 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -177,15 +177,6 @@ extern "C" { #endif /* DTRACE_PROBE4 */ #define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) -/* - * Credentials - */ -extern uid_t crgetuid(cred_t *cr); -extern uid_t crgetruid(cred_t *cr); -extern gid_t crgetgid(cred_t *cr); -extern int crgetngroups(cred_t *cr); -extern gid_t *crgetgroups(cred_t *cr); - /* * Thread-specific data */ @@ -371,12 +362,6 @@ typedef struct vsecattr { #define CPU_SEQID ((uintptr_t)pthread_self() & (max_ncpus - 1)) #define CPU_SEQID_UNSTABLE CPU_SEQID -#define kcred NULL -#define CRED() NULL - -#define crhold(cr) ((void)cr) -#define crfree(cr) ((void)cr) - #define ptob(x) ((x) * PAGESIZE) #define NN_DIVISOR_1000 (1U << 0) diff --git a/lib/libspl/include/sys/cred.h b/lib/libspl/include/sys/cred.h index 4f6183762..deceecee0 100644 --- a/lib/libspl/include/sys/cred.h +++ b/lib/libspl/include/sys/cred.h @@ -28,6 +28,24 @@ #ifndef _LIBSPL_SYS_CRED_H #define _LIBSPL_SYS_CRED_H +#include + +/* + * Credentials + */ + typedef struct cred cred_t; +extern uid_t crgetuid(cred_t *cr); +extern uid_t crgetruid(cred_t *cr); +extern gid_t crgetgid(cred_t *cr); +extern int crgetngroups(cred_t *cr); +extern gid_t *crgetgroups(cred_t *cr); + +#define kcred NULL +#define CRED() NULL + +#define crhold(cr) ((void)cr) +#define crfree(cr) ((void)cr) + #endif