From 2b5cd5990f587dedf5cfe3f857105af70c7a21ed Mon Sep 17 00:00:00 2001 From: DeHackEd Date: Wed, 21 Feb 2018 17:54:26 -0500 Subject: [PATCH 1/6] Fix multiple evaluations of VERIFY() and ASSERT() on failures Reviewed-by: loli10K Reviewed-by: Brian Behlendorf Signed-off-by: DHE Closes #684 Closes #685 --- include/sys/debug.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/sys/debug.h b/include/sys/debug.h index cd78171d..a4a45806 100644 --- a/include/sys/debug.h +++ b/include/sys/debug.h @@ -63,12 +63,15 @@ void spl_dumpstack(void); spl_panic(__FILE__, __FUNCTION__, __LINE__, \ "%s", "VERIFY(" #cond ") failed\n")) -#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ - (void) ((!((TYPE)(LEFT) OP (TYPE)(RIGHT))) && \ - spl_panic(__FILE__, __FUNCTION__, __LINE__, \ - "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ - "failed (" FMT " " #OP " " FMT ")\n", \ - CAST (LEFT), CAST (RIGHT))) +#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) do { \ + TYPE _verify3_left = (TYPE)(LEFT); \ + TYPE _verify3_right = (TYPE)(RIGHT); \ + if (!(_verify3_left OP _verify3_right)) \ + spl_panic(__FILE__, __FUNCTION__, __LINE__, \ + "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ + "failed (" FMT " " #OP " " FMT ")\n", \ + CAST (_verify3_left), CAST (_verify3_right)); \ + } while (0) #define VERIFY3B(x,y,z) VERIFY3_IMPL(x, y, z, boolean_t, "%d", (boolean_t)) #define VERIFY3S(x,y,z) VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long)) From 68386b05031a70f7f135481307318ef04c2f30e0 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Mon, 19 Feb 2018 19:23:53 +0900 Subject: [PATCH 2/6] Staticize kstat_default_update() This is only used via ->ks_update of `kstat_t *`. This isn't exported nor do headers have its prototype. Reviewed-by: Brian Behlendorf Signed-off-by: Tomohiro Kusumi Closes #686 --- module/spl/spl-kstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c index 70c0c98f..405ece0a 100644 --- a/module/spl/spl-kstat.c +++ b/module/spl/spl-kstat.c @@ -327,7 +327,7 @@ kstat_seq_show(struct seq_file *f, void *p) return (-rc); } -int +static int kstat_default_update(kstat_t *ksp, int rw) { ASSERT(ksp != NULL); From 378c6ed549e7d68eebb4b0bd37a09e66f70c647b Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Mon, 19 Feb 2018 20:40:38 +0900 Subject: [PATCH 3/6] Fix function name typos vn_init() and vn_fini() had been renamed by 12ff95ff in 2011. Reviewed-by: Brian Behlendorf Signed-off-by: Tomohiro Kusumi Closes #686 --- module/spl/spl-vnode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c index f019a087..79ca89ee 100644 --- a/module/spl/spl-vnode.c +++ b/module/spl/spl-vnode.c @@ -658,7 +658,7 @@ vn_file_cache_constructor(void *buf, void *cdrarg, int kmflags) INIT_LIST_HEAD(&fp->f_list); return (0); -} /* file_cache_constructor() */ +} /* vn_file_cache_constructor() */ static void vn_file_cache_destructor(void *buf, void *cdrarg) @@ -680,7 +680,7 @@ spl_vn_init(void) vn_file_cache_destructor, NULL, NULL, NULL, 0); return (0); -} /* vn_init() */ +} /* spl_vn_init() */ void spl_vn_fini(void) @@ -703,4 +703,4 @@ spl_vn_fini(void) kmem_cache_destroy(vn_file_cache); kmem_cache_destroy(vn_cache); -} /* vn_fini() */ +} /* spl_vn_fini() */ From 3673d032850c3b54b8b2cc74cf1782a75cc9b2a9 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sat, 24 Feb 2018 10:05:37 -0800 Subject: [PATCH 4/6] Fix more cstyle warnings This patch contains no functional changes. It is solely intended to resolve cstyle warnings in order to facilitate moving the spl source code in to the zfs repository. Reviewed-by: Giuseppe Di Natale Reviewed by: George Melikov Signed-off-by: Brian Behlendorf Closes #687 --- module/spl/spl-err.c | 5 ++++- module/spl/spl-generic.c | 11 ++++++++--- module/spl/spl-kmem-cache.c | 5 ++++- module/spl/spl-kmem.c | 5 ++++- module/spl/spl-kstat.c | 17 ++++++++++------- module/spl/spl-proc.c | 18 ++++++++++-------- module/spl/spl-thread.c | 3 +-- module/spl/spl-vnode.c | 11 +++++------ module/spl/spl-xdr.c | 10 +++++----- 9 files changed, 51 insertions(+), 34 deletions(-) diff --git a/module/spl/spl-err.c b/module/spl/spl-err.c index 33a8df89..6b71296e 100644 --- a/module/spl/spl-err.c +++ b/module/spl/spl-err.c @@ -34,9 +34,11 @@ * analysis and other such goodies. * But we would still default to the current default of not to do that. */ +/* BEGIN CSTYLED */ unsigned int spl_panic_halt; module_param(spl_panic_halt, uint, 0644); MODULE_PARM_DESC(spl_panic_halt, "Cause kernel panic on assertion failures"); +/* END CSTYLED */ /* * Limit the number of stack traces dumped to not more than 5 every @@ -55,7 +57,8 @@ spl_dumpstack(void) EXPORT_SYMBOL(spl_dumpstack); int -spl_panic(const char *file, const char *func, int line, const char *fmt, ...) { +spl_panic(const char *file, const char *func, int line, const char *fmt, ...) +{ const char *newfile; char msg[MAXMSGLEN]; va_list ap; diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c index efd90109..2a897269 100644 --- a/module/spl/spl-generic.c +++ b/module/spl/spl-generic.c @@ -50,10 +50,12 @@ char spl_version[32] = "SPL v" SPL_META_VERSION "-" SPL_META_RELEASE; EXPORT_SYMBOL(spl_version); +/* BEGIN CSTYLED */ unsigned long spl_hostid = 0; EXPORT_SYMBOL(spl_hostid); module_param(spl_hostid, ulong, 0644); MODULE_PARM_DESC(spl_hostid, "The system hostid."); +/* END CSTYLED */ proc_t p0; EXPORT_SYMBOL(p0); @@ -98,7 +100,8 @@ static DEFINE_PER_CPU(uint64_t[2], spl_pseudo_entropy); */ static inline uint64_t -spl_rand_next(uint64_t *s) { +spl_rand_next(uint64_t *s) +{ uint64_t s1 = s[0]; const uint64_t s0 = s[1]; s[0] = s0; @@ -108,7 +111,8 @@ spl_rand_next(uint64_t *s) { } static inline void -spl_rand_jump(uint64_t *s) { +spl_rand_jump(uint64_t *s) +{ static const uint64_t JUMP[] = { 0x8a5cd789635d2dff, 0x121fd2155c472f96 }; @@ -184,7 +188,8 @@ EXPORT_SYMBOL(random_get_pseudo_bytes); * Calculate number of leading of zeros for a 64-bit value. */ static int -nlz64(uint64_t x) { +nlz64(uint64_t x) +{ register int n = 0; if (x == 0) diff --git a/module/spl/spl-kmem-cache.c b/module/spl/spl-kmem-cache.c index e4bcdd82..c73a2fdc 100644 --- a/module/spl/spl-kmem-cache.c +++ b/module/spl/spl-kmem-cache.c @@ -66,6 +66,7 @@ * because it has been shown to improve responsiveness on low memory systems. * This policy may be changed by setting KMC_EXPIRE_AGE or KMC_EXPIRE_MEM. */ +/* BEGIN CSTYLED */ unsigned int spl_kmem_cache_expire = KMC_EXPIRE_MEM; EXPORT_SYMBOL(spl_kmem_cache_expire); module_param(spl_kmem_cache_expire, uint, 0644); @@ -148,6 +149,7 @@ unsigned int spl_kmem_cache_kmem_threads = 4; module_param(spl_kmem_cache_kmem_threads, uint, 0444); MODULE_PARM_DESC(spl_kmem_cache_kmem_threads, "Number of spl_kmem_cache threads"); +/* END CSTYLED */ /* * Slab allocation interfaces @@ -356,8 +358,9 @@ spl_slab_alloc(spl_kmem_cache_t *skc, int flags) if (rc) { if (skc->skc_flags & KMC_OFFSLAB) list_for_each_entry_safe(sko, - n, &sks->sks_free_list, sko_list) + n, &sks->sks_free_list, sko_list) { kv_free(skc, sko->sko_addr, offslab_size); + } kv_free(skc, base, skc->skc_slab_size); sks = NULL; diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c index bf9c6b17..e0d55104 100644 --- a/module/spl/spl-kmem.c +++ b/module/spl/spl-kmem.c @@ -44,6 +44,7 @@ * allocations are quickly caught. These warnings may be disabled by setting * the threshold to zero. */ +/* BEGIN CSTYLED */ unsigned int spl_kmem_alloc_warn = MIN(16 * PAGE_SIZE, 64 * 1024); module_param(spl_kmem_alloc_warn, uint, 0644); MODULE_PARM_DESC(spl_kmem_alloc_warn, @@ -64,6 +65,7 @@ module_param(spl_kmem_alloc_max, uint, 0644); MODULE_PARM_DESC(spl_kmem_alloc_max, "Maximum size in bytes for a kmem_alloc()"); EXPORT_SYMBOL(spl_kmem_alloc_max); +/* END CSTYLED */ int kmem_debugging(void) @@ -520,10 +522,11 @@ spl_kmem_fini_tracking(struct list_head *list, spinlock_t *lock) printk(KERN_WARNING "%-16s %-5s %-16s %s:%s\n", "address", "size", "data", "func", "line"); - list_for_each_entry(kd, list, kd_list) + list_for_each_entry(kd, list, kd_list) { printk(KERN_WARNING "%p %-5d %-16s %s:%d\n", kd->kd_addr, (int)kd->kd_size, spl_sprintf_addr(kd, str, 17, 8), kd->kd_func, kd->kd_line); + } spin_unlock_irqrestore(lock, flags); } diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c index 405ece0a..10e93f31 100644 --- a/module/spl/spl-kstat.c +++ b/module/spl/spl-kstat.c @@ -305,7 +305,7 @@ kstat_seq_show(struct seq_file *f, void *p) } else { ASSERT(ksp->ks_ndata == 1); rc = kstat_seq_show_raw(f, ksp->ks_data, - ksp->ks_data_size); + ksp->ks_data_size); } break; case KSTAT_TYPE_NAMED: @@ -434,9 +434,10 @@ kstat_find_module(char *name) { kstat_module_t *module; - list_for_each_entry(module, &kstat_module_list, ksm_module_list) + list_for_each_entry(module, &kstat_module_list, ksm_module_list) { if (strncmp(name, module->ksm_name, KSTAT_STRLEN) == 0) return (module); + } return (NULL); } @@ -517,9 +518,9 @@ static struct file_operations proc_kstat_operations = { void __kstat_set_raw_ops(kstat_t *ksp, - int (*headers)(char *buf, size_t size), - int (*data)(char *buf, size_t size, void *data), - void *(*addr)(kstat_t *ksp, loff_t index)) + int (*headers)(char *buf, size_t size), + int (*data)(char *buf, size_t size, void *data), + void *(*addr)(kstat_t *ksp, loff_t index)) { ksp->ks_raw_ops.headers = headers; ksp->ks_raw_ops.data = data; @@ -628,11 +629,12 @@ kstat_detect_collision(kstat_t *ksp) cp[0] = '\0'; if ((module = kstat_find_module(parent)) != NULL) { - list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list) + list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list) { if (strncmp(tmp->ks_name, cp+1, KSTAT_STRLEN) == 0) { strfree(parent); return (EEXIST); } + } } strfree(parent); @@ -665,9 +667,10 @@ __kstat_install(kstat_t *ksp) * Only one entry by this name per-module, on failure the module * shouldn't be deleted because we know it has at least one entry. */ - list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list) + list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list) { if (strncmp(tmp->ks_name, ksp->ks_name, KSTAT_STRLEN) == 0) goto out; + } list_add_tail(&ksp->ks_list, &module->ksm_kstat_list); diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c index f5998a06..796f69e4 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c @@ -85,8 +85,8 @@ proc_copyin_string(char *kbuffer, int kbuffer_size, const char *ubuffer, } static int -proc_copyout_string(char *ubuffer, int ubuffer_size, - const char *kbuffer, char *append) +proc_copyout_string(char *ubuffer, int ubuffer_size, const char *kbuffer, + char *append) { /* * NB if 'append' != NULL, it's a single character to append to the @@ -239,9 +239,11 @@ taskq_seq_show_headers(struct seq_file *f) #define LHEAD_ACTIVE 4 #define LHEAD_SIZE 5 +/* BEGIN CSTYLED */ static unsigned int spl_max_show_tasks = 512; module_param(spl_max_show_tasks, uint, 0644); MODULE_PARM_DESC(spl_max_show_tasks, "Max number of tasks shown in taskq proc"); +/* END CSTYLED */ static int taskq_seq_show_impl(struct seq_file *f, void *p, boolean_t allflag) @@ -719,15 +721,15 @@ spl_proc_init(void) goto out; } - proc_spl_taskq_all = proc_create_data("taskq-all", 0444, - proc_spl, &proc_taskq_all_operations, NULL); + proc_spl_taskq_all = proc_create_data("taskq-all", 0444, proc_spl, + &proc_taskq_all_operations, NULL); if (proc_spl_taskq_all == NULL) { rc = -EUNATCH; goto out; } - proc_spl_taskq = proc_create_data("taskq", 0444, - proc_spl, &proc_taskq_operations, NULL); + proc_spl_taskq = proc_create_data("taskq", 0444, proc_spl, + &proc_taskq_operations, NULL); if (proc_spl_taskq == NULL) { rc = -EUNATCH; goto out; @@ -739,8 +741,8 @@ spl_proc_init(void) goto out; } - proc_spl_kmem_slab = proc_create_data("slab", 0444, - proc_spl_kmem, &proc_slab_operations, NULL); + proc_spl_kmem_slab = proc_create_data("slab", 0444, proc_spl_kmem, + &proc_slab_operations, NULL); if (proc_spl_kmem_slab == NULL) { rc = -EUNATCH; goto out; diff --git a/module/spl/spl-thread.c b/module/spl/spl-thread.c index 9ad04416..d441ad65 100644 --- a/module/spl/spl-thread.c +++ b/module/spl/spl-thread.c @@ -79,8 +79,7 @@ EXPORT_SYMBOL(__thread_exit); */ kthread_t * __thread_create(caddr_t stk, size_t stksize, thread_func_t func, - const char *name, void *args, size_t len, proc_t *pp, - int state, pri_t pri) + const char *name, void *args, size_t len, proc_t *pp, int state, pri_t pri) { thread_priv_t *tp; struct task_struct *tsk; diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c index 79ca89ee..a371fb96 100644 --- a/module/spl/spl-vnode.c +++ b/module/spl/spl-vnode.c @@ -118,8 +118,8 @@ vn_free(vnode_t *vp) EXPORT_SYMBOL(vn_free); int -vn_open(const char *path, uio_seg_t seg, int flags, int mode, - vnode_t **vpp, int x1, void *x2) +vn_open(const char *path, uio_seg_t seg, int flags, int mode, vnode_t **vpp, + int x1, void *x2) { struct file *fp; struct kstat stat; @@ -210,7 +210,7 @@ EXPORT_SYMBOL(vn_openat); int vn_rdwr(uio_rw_t uio, vnode_t *vp, void *addr, ssize_t len, offset_t off, - uio_seg_t seg, int ioflag, rlim64_t x2, void *x3, ssize_t *residp) + uio_seg_t seg, int ioflag, rlim64_t x2, void *x3, ssize_t *residp) { struct file *fp = vp->v_file; loff_t offset = off; @@ -401,9 +401,8 @@ int vn_space(vnode_t *vp, int cmd, struct flock *bfp, int flag, --end; vp->v_file->f_dentry->d_inode->i_op->truncate_range( - vp->v_file->f_dentry->d_inode, - bfp->l_start, end - ); + vp->v_file->f_dentry->d_inode, bfp->l_start, end); + return (0); } #endif diff --git a/module/spl/spl-xdr.c b/module/spl/spl-xdr.c index c582913f..4055921b 100644 --- a/module/spl/spl-xdr.c +++ b/module/spl/spl-xdr.c @@ -160,7 +160,7 @@ EXPORT_SYMBOL(xdrmem_create); static bool_t xdrmem_control(XDR *xdrs, int req, void *info) { - struct xdr_bytesrec *rec = (struct xdr_bytesrec *) info; + struct xdr_bytesrec *rec = (struct xdr_bytesrec *)info; if (req != XDR_GET_BYTES_AVAIL) return (FALSE); @@ -236,7 +236,7 @@ xdrmem_enc_uint32(XDR *xdrs, uint32_t val) if (xdrs->x_addr + sizeof (uint32_t) > xdrs->x_addr_end) return (FALSE); - *((uint32_t *) xdrs->x_addr) = cpu_to_be32(val); + *((uint32_t *)xdrs->x_addr) = cpu_to_be32(val); xdrs->x_addr += sizeof (uint32_t); @@ -249,7 +249,7 @@ xdrmem_dec_uint32(XDR *xdrs, uint32_t *val) if (xdrs->x_addr + sizeof (uint32_t) > xdrs->x_addr_end) return (FALSE); - *val = be32_to_cpu(*((uint32_t *) xdrs->x_addr)); + *val = be32_to_cpu(*((uint32_t *)xdrs->x_addr)); xdrs->x_addr += sizeof (uint32_t); @@ -333,7 +333,7 @@ xdrmem_dec_uint(XDR *xdrs, unsigned *up) { BUILD_BUG_ON(sizeof (unsigned) != 4); - return (xdrmem_dec_uint32(xdrs, (uint32_t *) up)); + return (xdrmem_dec_uint32(xdrs, (uint32_t *)up)); } static bool_t @@ -359,7 +359,7 @@ xdrmem_dec_ulonglong(XDR *xdrs, u_longlong_t *ullp) if (!xdrmem_dec_uint32(xdrs, &low)) return (FALSE); - *ullp = ((u_longlong_t) high << 32) | low; + *ullp = ((u_longlong_t)high << 32) | low; return (TRUE); } From 43983eb2024ec6b3280e6e06a6fb621ee3bb2a41 Mon Sep 17 00:00:00 2001 From: LOLi Date: Fri, 9 Mar 2018 22:51:31 +0100 Subject: [PATCH 5/6] Fix spl-kmod builds when using rpm >= 4.14 With rpm-software-management/rpm@5e94633 a package version containing invalid characters (most commonly a double '-') causes the kmod package generation to terminate with an error. This change takes advantage of the newly introduced rpm macro "_wrong_version_format_terminate_build" to allow kmod packages to be built. Reviewed-by: Brian Behlendorf Signed-off-by: loli10K Closes #691 --- config/spl-build.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/config/spl-build.m4 b/config/spl-build.m4 index 553b5d51..9c97e64f 100644 --- a/config/spl-build.m4 +++ b/config/spl-build.m4 @@ -231,6 +231,7 @@ AC_DEFUN([SPL_AC_RPM], [ RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"' RPM_DEFINE_UTIL= RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"' + RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' RPM_DEFINE_DKMS= SRPM_DEFINE_COMMON='--define "build_src_rpm 1"' From 581bc01a0765eed9ea7dc17132b3943a5efc966d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 4 Apr 2018 09:54:20 -0700 Subject: [PATCH 6/6] Remove sysevents These headers are provided in the ZFS repository and never used by the SPL. Remove them to ensure the right ones are included. Reviewed-by: Tim Chase Signed-off-by: Brian Behlendorf Closes #696 --- configure.ac | 1 - include/sys/Makefile.am | 3 +-- include/sys/sysevent.h | 28 ---------------------------- include/sys/sysevent/Makefile.am | 13 ------------- include/sys/sysevent/eventdefs.h | 28 ---------------------------- 5 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 include/sys/sysevent.h delete mode 100644 include/sys/sysevent/Makefile.am delete mode 100644 include/sys/sysevent/eventdefs.h diff --git a/configure.ac b/configure.ac index 70735ce2..59ee3ca0 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,6 @@ AC_CONFIG_FILES([ include/sys/Makefile include/sys/fm/Makefile include/sys/fs/Makefile - include/sys/sysevent/Makefile include/util/Makefile include/vm/Makefile scripts/Makefile diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index a16bd6ce..45b65897 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = fm fs sysevent +SUBDIRS = fm fs COMMON_H = @@ -77,7 +77,6 @@ KERNEL_H = \ $(top_srcdir)/include/sys/sunddi.h \ $(top_srcdir)/include/sys/sunldi.h \ $(top_srcdir)/include/sys/sysdc.h \ - $(top_srcdir)/include/sys/sysevent.h \ $(top_srcdir)/include/sys/sysmacros.h \ $(top_srcdir)/include/sys/systeminfo.h \ $(top_srcdir)/include/sys/systm.h \ diff --git a/include/sys/sysevent.h b/include/sys/sysevent.h deleted file mode 100644 index 78e582f3..00000000 --- a/include/sys/sysevent.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 . - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see . - * - * 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 . - */ - -#ifndef _SPL_SYSEVENT_H -#define _SPL_SYSEVENT_H - -#endif /* _SPL_SYSEVENT_H */ diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am deleted file mode 100644 index 63d9af31..00000000 --- a/include/sys/sysevent/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/sys/sysevent/eventdefs.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/sys/sysevent/eventdefs.h b/include/sys/sysevent/eventdefs.h deleted file mode 100644 index f92cc4f8..00000000 --- a/include/sys/sysevent/eventdefs.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 . - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see . - * - * 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 . - */ - -#ifndef _SPL_SYSEVENT_EVENTDEFS_H -#define _SPL_SYSEVENT_EVENTDEFS_H - -#endif /* _SPL_SYSEVENT_EVENTDEFS_H */