mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-01-25 10:12:13 +03:00
mod.h: make consistent across all three platforms
mod.h only exists to include the platform-specific mod_os.h, so we can get rid of it and just call the platform header mod.h. Then, create a libspl mod.h, and move the relevant items to it so we can start building on it. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Signed-off-by: Rob Norris <robn@despairlabs.com> Closes #17537
This commit is contained in:
parent
fe3b2b76cf
commit
3a494c6d2a
@ -69,7 +69,6 @@ COMMON_H = \
|
|||||||
sys/metaslab_impl.h \
|
sys/metaslab_impl.h \
|
||||||
sys/mmp.h \
|
sys/mmp.h \
|
||||||
sys/mntent.h \
|
sys/mntent.h \
|
||||||
sys/mod.h \
|
|
||||||
sys/multilist.h \
|
sys/multilist.h \
|
||||||
sys/nvpair.h \
|
sys/nvpair.h \
|
||||||
sys/nvpair_impl.h \
|
sys/nvpair_impl.h \
|
||||||
|
|||||||
@ -33,7 +33,7 @@ noinst_HEADERS = \
|
|||||||
%D%/spl/sys/list_impl.h \
|
%D%/spl/sys/list_impl.h \
|
||||||
%D%/spl/sys/lock.h \
|
%D%/spl/sys/lock.h \
|
||||||
%D%/spl/sys/misc.h \
|
%D%/spl/sys/misc.h \
|
||||||
%D%/spl/sys/mod_os.h \
|
%D%/spl/sys/mod.h \
|
||||||
%D%/spl/sys/mode.h \
|
%D%/spl/sys/mode.h \
|
||||||
%D%/spl/sys/mount.h \
|
%D%/spl/sys/mount.h \
|
||||||
%D%/spl/sys/mutex.h \
|
%D%/spl/sys/mutex.h \
|
||||||
|
|||||||
@ -75,7 +75,7 @@ kernel_spl_sys_HEADERS = \
|
|||||||
%D%/spl/sys/kstat.h \
|
%D%/spl/sys/kstat.h \
|
||||||
%D%/spl/sys/list.h \
|
%D%/spl/sys/list.h \
|
||||||
%D%/spl/sys/misc.h \
|
%D%/spl/sys/misc.h \
|
||||||
%D%/spl/sys/mod_os.h \
|
%D%/spl/sys/mod.h \
|
||||||
%D%/spl/sys/mutex.h \
|
%D%/spl/sys/mutex.h \
|
||||||
%D%/spl/sys/param.h \
|
%D%/spl/sys/param.h \
|
||||||
%D%/spl/sys/proc.h \
|
%D%/spl/sys/proc.h \
|
||||||
|
|||||||
@ -1,36 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
|
|
||||||
* Copyright (C) 2007 The Regents of the University of California.
|
|
||||||
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
|
|
||||||
* Written by Brian Behlendorf <behlendorf1@llnl.gov>.
|
|
||||||
* UCRL-CODE-235197
|
|
||||||
*
|
|
||||||
* This file is part of the SPL, Solaris Porting Layer.
|
|
||||||
*
|
|
||||||
* The SPL is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License as published by the
|
|
||||||
* Free Software Foundation; either version 2 of the License, or (at your
|
|
||||||
* option) any later version.
|
|
||||||
*
|
|
||||||
* The SPL is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
* for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with the SPL. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#ifndef _SYS_MOD_H
|
|
||||||
#define _SYS_MOD_H
|
|
||||||
|
|
||||||
#ifdef _KERNEL
|
|
||||||
#include <sys/mod_os.h>
|
|
||||||
#else
|
|
||||||
/*
|
|
||||||
* Exported symbols
|
|
||||||
*/
|
|
||||||
#define EXPORT_SYMBOL(x)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* SYS_MOD_H */
|
|
||||||
@ -645,7 +645,7 @@ extern int vdev_obsolete_counts_are_precise(vdev_t *vd, boolean_t *are_precise);
|
|||||||
int vdev_checkpoint_sm_object(vdev_t *vd, uint64_t *sm_obj);
|
int vdev_checkpoint_sm_object(vdev_t *vd, uint64_t *sm_obj);
|
||||||
void vdev_metaslab_group_create(vdev_t *vd);
|
void vdev_metaslab_group_create(vdev_t *vd);
|
||||||
uint64_t vdev_best_ashift(uint64_t logical, uint64_t a, uint64_t b);
|
uint64_t vdev_best_ashift(uint64_t logical, uint64_t a, uint64_t b);
|
||||||
#if defined(__linux__)
|
#if defined(__linux__) && defined(_KERNEL)
|
||||||
int param_get_raidz_impl(char *buf, zfs_kernel_param_t *kp);
|
int param_get_raidz_impl(char *buf, zfs_kernel_param_t *kp);
|
||||||
#endif
|
#endif
|
||||||
int param_set_raidz_impl(ZFS_MODULE_PARAM_ARGS);
|
int param_set_raidz_impl(ZFS_MODULE_PARAM_ARGS);
|
||||||
|
|||||||
@ -204,18 +204,6 @@ extern void vpanic(const char *, va_list)
|
|||||||
#endif /* DTRACE_PROBE4 */
|
#endif /* DTRACE_PROBE4 */
|
||||||
#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i)
|
#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i)
|
||||||
|
|
||||||
/*
|
|
||||||
* Tunables.
|
|
||||||
*/
|
|
||||||
typedef struct zfs_kernel_param {
|
|
||||||
const char *name; /* unused stub */
|
|
||||||
} zfs_kernel_param_t;
|
|
||||||
|
|
||||||
#define ZFS_MODULE_PARAM(scope_prefix, name_prefix, name, type, perm, desc)
|
|
||||||
#define ZFS_MODULE_PARAM_ARGS void
|
|
||||||
#define ZFS_MODULE_PARAM_CALL(scope_prefix, name_prefix, name, setfunc, \
|
|
||||||
getfunc, perm, desc)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Threads.
|
* Threads.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -45,6 +45,7 @@ libspl_sys_HEADERS = \
|
|||||||
%D%/sys/list_impl.h \
|
%D%/sys/list_impl.h \
|
||||||
%D%/sys/mhd.h \
|
%D%/sys/mhd.h \
|
||||||
%D%/sys/mkdev.h \
|
%D%/sys/mkdev.h \
|
||||||
|
%D%/sys/mod.h \
|
||||||
%D%/sys/policy.h \
|
%D%/sys/policy.h \
|
||||||
%D%/sys/poll.h \
|
%D%/sys/poll.h \
|
||||||
%D%/sys/priv.h \
|
%D%/sys/priv.h \
|
||||||
|
|||||||
39
lib/libspl/include/sys/mod.h
Normal file
39
lib/libspl/include/sys/mod.h
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// SPDX-License-Identifier: CDDL-1.0
|
||||||
|
/*
|
||||||
|
* CDDL HEADER START
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the terms of the
|
||||||
|
* 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.
|
||||||
|
* See the License for the specific language governing permissions
|
||||||
|
* and limitations under the License.
|
||||||
|
*
|
||||||
|
* When distributing Covered Code, include this CDDL HEADER in each
|
||||||
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||||
|
* If applicable, add the following below this CDDL HEADER, with the
|
||||||
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||||
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||||
|
*
|
||||||
|
* CDDL HEADER END
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
* 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 _SYS_MOD_H
|
||||||
|
#define _SYS_MOD_H
|
||||||
|
|
||||||
|
#define ZFS_MODULE_PARAM(scope, prefix, name, type, perm, desc)
|
||||||
|
#define ZFS_MODULE_PARAM_ARGS void
|
||||||
|
#define ZFS_MODULE_PARAM_CALL(scope_prefix, name_prefix, name, setfunc, \
|
||||||
|
getfunc, perm, desc)
|
||||||
|
|
||||||
|
#define EXPORT_SYMBOL(x)
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -253,7 +253,6 @@ my %override_file_license_tags = (
|
|||||||
'GPL-2.0-or-later' => [qw(
|
'GPL-2.0-or-later' => [qw(
|
||||||
include/os/freebsd/spl/sys/kstat.h
|
include/os/freebsd/spl/sys/kstat.h
|
||||||
include/os/freebsd/spl/sys/sunddi.h
|
include/os/freebsd/spl/sys/sunddi.h
|
||||||
include/sys/mod.h
|
|
||||||
)],
|
)],
|
||||||
'CDDL-1.0' => [qw(
|
'CDDL-1.0' => [qw(
|
||||||
include/os/linux/spl/sys/errno.h
|
include/os/linux/spl/sys/errno.h
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user