c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-11 04:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

libspl: move callb stubs from zfs_context.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-18 23:45:31 +11:00 committed by Brian Behlendorf
parent 9d609098cd
commit 2b4a0dd6c0
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/sys/zfs_context.h
View File

@ -79,7 +79,6 @@ extern "C" {
#define _SYS_VFS_H #define _SYS_VFS_H
#define _SYS_SUNDDI_H #define _SYS_SUNDDI_H
#define _SYS_CALLB_H
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -131,6 +130,7 @@ extern "C" {
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/misc.h> #include <sys/misc.h>
#include <sys/random.h> #include <sys/random.h>
#include <sys/callb.h>
#include <sys/zfs_context_os.h> #include <sys/zfs_context_os.h>
@ -211,27 +211,6 @@ typedef off_t loff_t;
extern int highbit64(uint64_t i); extern int highbit64(uint64_t i);
extern int lowbit64(uint64_t i); extern int lowbit64(uint64_t i);
typedef struct callb_cpr {
kmutex_t *cc_lockp;
} callb_cpr_t;
#define CALLB_CPR_INIT(cp, lockp, func, name) { \
(cp)->cc_lockp = lockp; \
}
#define CALLB_CPR_SAFE_BEGIN(cp) { \
ASSERT(MUTEX_HELD((cp)->cc_lockp)); \
}
#define CALLB_CPR_SAFE_END(cp, lockp) { \
ASSERT(MUTEX_HELD((cp)->cc_lockp)); \
}
#define CALLB_CPR_EXIT(cp) { \
ASSERT(MUTEX_HELD((cp)->cc_lockp)); \
mutex_exit((cp)->cc_lockp); \
}
#define zone_dataset_visible(x, y) (1) #define zone_dataset_visible(x, y) (1)
#define INGLOBALZONE(z) (1) #define INGLOBALZONE(z) (1)
extern uint32_t zone_get_hostid(void *zonep); extern uint32_t zone_get_hostid(void *zonep);

29
lib/libspl/include/sys/callb.h
View File

@ -21,11 +21,36 @@
* CDDL HEADER END * CDDL HEADER END
*/ */
/* /*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms. * 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 _SYS_CALLB_H #ifndef _SYS_CALLB_H
#define _SYS_CALLB_H #define _SYS_CALLB_H
#include <sys/mutex.h>
typedef struct callb_cpr {
kmutex_t *cc_lockp;
} callb_cpr_t;
#define CALLB_CPR_INIT(cp, lockp, func, name) { \
(cp)->cc_lockp = lockp; \
}
#define CALLB_CPR_SAFE_BEGIN(cp) { \
ASSERT(MUTEX_HELD((cp)->cc_lockp)); \
}
#define CALLB_CPR_SAFE_END(cp, lockp) { \
ASSERT(MUTEX_HELD((cp)->cc_lockp)); \
}
#define CALLB_CPR_EXIT(cp) { \
ASSERT(MUTEX_HELD((cp)->cc_lockp)); \
mutex_exit((cp)->cc_lockp); \
}
#endif #endif