diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 18 | ||||
| -rw-r--r-- | include/fs/Makefile.am | 13 | ||||
| -rw-r--r-- | include/fs/fs_subr.h | 28 | ||||
| -rw-r--r-- | include/linux/Makefile.am | 23 | ||||
| -rw-r--r-- | include/linux/bitops_compat.h | 30 | ||||
| -rw-r--r-- | include/linux/compiler_compat.h | 47 | ||||
| -rw-r--r-- | include/linux/delay_compat.h | 47 | ||||
| -rw-r--r-- | include/linux/file_compat.h | 140 | ||||
| -rw-r--r-- | include/linux/list_compat.h | 50 | ||||
| -rw-r--r-- | include/linux/math64_compat.h | 33 | ||||
| -rw-r--r-- | include/linux/proc_compat.h | 35 | ||||
| -rw-r--r-- | include/linux/rwsem_compat.h | 68 | ||||
| -rw-r--r-- | include/linux/zlib_compat.h | 37 | ||||
| -rw-r--r-- | include/rpc/Makefile.am | 14 | ||||
| -rw-r--r-- | include/rpc/types.h | 30 | ||||
| -rw-r--r-- | include/sharefs/Makefile.am | 13 | ||||
| -rw-r--r-- | include/sharefs/share.h | 28 | ||||
| -rw-r--r-- | include/spl-ctl.h | 45 | ||||
| -rw-r--r-- | include/spl/rpc/xdr.h (renamed from include/rpc/xdr.h) | 3 | ||||
| -rw-r--r-- | include/spl/sys/acl.h (renamed from include/sys/acl.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/atomic.h | 79 | ||||
| -rw-r--r-- | include/spl/sys/byteorder.h (renamed from include/sys/byteorder.h) | 5 | ||||
| -rw-r--r-- | include/spl/sys/callb.h (renamed from include/sys/callb.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/callo.h (renamed from include/sys/callo.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/cmn_err.h (renamed from include/sys/cmn_err.h) | 6 | ||||
| -rw-r--r-- | include/spl/sys/condvar.h (renamed from include/sys/condvar.h) | 3 | ||||
| -rw-r--r-- | include/spl/sys/console.h (renamed from include/sys/console.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/cred.h (renamed from include/sys/cred.h) | 1 | ||||
| -rw-r--r-- | include/spl/sys/ctype.h (renamed from include/sys/ctype.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/debug.h (renamed from include/sys/debug.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/disp.h (renamed from include/sys/disp.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/dkio.h (renamed from include/sys/dkio.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/dkioc_free_util.h (renamed from include/sys/dkioc_free_util.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/fcntl.h (renamed from include/sys/fcntl.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/file.h (renamed from include/sys/file.h) | 25 | ||||
| -rw-r--r-- | include/spl/sys/inttypes.h (renamed from include/sys/inttypes.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/isa_defs.h (renamed from include/sys/isa_defs.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/kmem.h (renamed from include/sys/kmem.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/kmem_cache.h (renamed from include/sys/kmem_cache.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/kobj.h (renamed from include/sys/kobj.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/kstat.h (renamed from include/sys/kstat.h) | 2 | ||||
| -rw-r--r-- | include/spl/sys/list.h (renamed from include/sys/list.h) | 11 | ||||
| -rw-r--r-- | include/spl/sys/mode.h (renamed from include/sys/mode.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/mutex.h (renamed from include/sys/mutex.h) | 1 | ||||
| -rw-r--r-- | include/spl/sys/param.h (renamed from include/sys/param.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/proc.h (renamed from include/sys/proc.h) | 7 | ||||
| -rw-r--r-- | include/spl/sys/processor.h (renamed from include/sys/processor.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/random.h (renamed from include/sys/random.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/rwlock.h (renamed from include/sys/rwlock.h) | 39 | ||||
| -rw-r--r-- | include/spl/sys/shrinker.h (renamed from include/linux/mm_compat.h) | 6 | ||||
| -rw-r--r-- | include/spl/sys/sid.h (renamed from include/sys/sid.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/signal.h (renamed from include/sys/signal.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/stat.h (renamed from include/sys/stat.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/strings.h (renamed from include/sys/idmap.h) | 14 | ||||
| -rw-r--r-- | include/spl/sys/sunddi.h (renamed from include/sys/sunddi.h) | 1 | ||||
| -rw-r--r-- | include/spl/sys/sysmacros.h (renamed from include/sys/sysmacros.h) | 17 | ||||
| -rw-r--r-- | include/spl/sys/systeminfo.h (renamed from include/sys/systeminfo.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/taskq.h (renamed from include/sys/taskq.h) | 2 | ||||
| -rw-r--r-- | include/spl/sys/thread.h (renamed from include/sys/thread.h) | 4 | ||||
| -rw-r--r-- | include/spl/sys/time.h (renamed from include/sys/time.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/timer.h (renamed from include/sys/timer.h) | 16 | ||||
| -rw-r--r-- | include/spl/sys/tsd.h (renamed from include/sys/tsd.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/types.h (renamed from include/sys/types.h) | 58 | ||||
| -rw-r--r-- | include/spl/sys/types32.h (renamed from include/sys/types32.h) | 1 | ||||
| -rw-r--r-- | include/spl/sys/uio.h (renamed from include/sys/uio.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/user.h (renamed from include/sys/user.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/vfs.h (renamed from include/sys/vfs.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/vmem.h (renamed from include/sys/vmem.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/vmsystm.h (renamed from include/sys/vmsystm.h) | 0 | ||||
| -rw-r--r-- | include/spl/sys/vnode.h (renamed from include/sys/vnode.h) | 1 | ||||
| -rw-r--r-- | include/spl/sys/wait.h (renamed from include/linux/wait_compat.h) | 6 | ||||
| -rw-r--r-- | include/spl/sys/zmod.h (renamed from include/sys/zmod.h) | 8 | ||||
| -rw-r--r-- | include/spl/sys/zone.h (renamed from include/sys/zone.h) | 0 | ||||
| -rw-r--r-- | include/splat-ctl.h | 109 | ||||
| -rw-r--r-- | include/strings.h | 28 | ||||
| -rw-r--r-- | include/sys/Makefile.am | 113 | ||||
| -rw-r--r-- | include/sys/acl_impl.h | 28 | ||||
| -rw-r--r-- | include/sys/atomic.h | 313 | ||||
| -rw-r--r-- | include/sys/attr.h | 28 | ||||
| -rw-r--r-- | include/sys/bitmap.h | 28 | ||||
| -rw-r--r-- | include/sys/bootconf.h | 28 | ||||
| -rw-r--r-- | include/sys/bootprops.h | 28 | ||||
| -rw-r--r-- | include/sys/buf.h | 28 | ||||
| -rw-r--r-- | include/sys/compress.h | 28 | ||||
| -rw-r--r-- | include/sys/conf.h | 28 | ||||
| -rw-r--r-- | include/sys/cpupart.h | 28 | ||||
| -rw-r--r-- | include/sys/cpuvar.h | 28 | ||||
| -rw-r--r-- | include/sys/crc32.h | 28 | ||||
| -rw-r--r-- | include/sys/ddi.h | 28 | ||||
| -rw-r--r-- | include/sys/dirent.h | 28 | ||||
| -rw-r--r-- | include/sys/dklabel.h | 28 | ||||
| -rw-r--r-- | include/sys/dnlc.h | 28 | ||||
| -rw-r--r-- | include/sys/dumphdr.h | 28 | ||||
| -rw-r--r-- | include/sys/efi_partition.h | 28 | ||||
| -rw-r--r-- | include/sys/errno.h | 28 | ||||
| -rw-r--r-- | include/sys/extdirent.h | 29 | ||||
| -rw-r--r-- | include/sys/fm/Makefile.am | 14 | ||||
| -rw-r--r-- | include/sys/fm/protocol.h | 28 | ||||
| -rw-r--r-- | include/sys/fm/util.h | 28 | ||||
| -rw-r--r-- | include/sys/fs/Makefile.am | 13 | ||||
| -rw-r--r-- | include/sys/fs/swapnode.h | 28 | ||||
| -rw-r--r-- | include/sys/int_limits.h | 28 | ||||
| -rw-r--r-- | include/sys/int_types.h | 30 | ||||
| -rw-r--r-- | include/sys/kidmap.h | 30 | ||||
| -rw-r--r-- | include/sys/mkdev.h | 28 | ||||
| -rw-r--r-- | include/sys/mntent.h | 28 | ||||
| -rw-r--r-- | include/sys/modctl.h | 28 | ||||
| -rw-r--r-- | include/sys/mount.h | 28 | ||||
| -rw-r--r-- | include/sys/note.h | 28 | ||||
| -rw-r--r-- | include/sys/open.h | 28 | ||||
| -rw-r--r-- | include/sys/pathname.h | 35 | ||||
| -rw-r--r-- | include/sys/policy.h | 47 | ||||
| -rw-r--r-- | include/sys/pool.h | 30 | ||||
| -rw-r--r-- | include/sys/priv_impl.h | 28 | ||||
| -rw-r--r-- | include/sys/pset.h | 38 | ||||
| -rw-r--r-- | include/sys/refstr.h | 28 | ||||
| -rw-r--r-- | include/sys/resource.h | 30 | ||||
| -rw-r--r-- | include/sys/sdt.h | 30 | ||||
| -rw-r--r-- | include/sys/stropts.h | 28 | ||||
| -rw-r--r-- | include/sys/sunldi.h | 43 | ||||
| -rw-r--r-- | include/sys/sysdc.h | 28 | ||||
| -rw-r--r-- | include/sys/systm.h | 32 | ||||
| -rw-r--r-- | include/sys/t_lock.h | 33 | ||||
| -rw-r--r-- | include/sys/u8_textprep.h | 28 | ||||
| -rw-r--r-- | include/sys/unistd.h | 28 | ||||
| -rw-r--r-- | include/sys/va_list.h | 28 | ||||
| -rw-r--r-- | include/sys/varargs.h | 30 | ||||
| -rw-r--r-- | include/sys/vfs_opreg.h | 28 | ||||
| -rw-r--r-- | include/unistd.h | 28 | ||||
| -rw-r--r-- | include/util/Makefile.am | 14 | ||||
| -rw-r--r-- | include/util/qsort.h | 32 | ||||
| -rw-r--r-- | include/util/sscanf.h | 28 | ||||
| -rw-r--r-- | include/vm/Makefile.am | 15 | ||||
| -rw-r--r-- | include/vm/anon.h | 28 | ||||
| -rw-r--r-- | include/vm/pvn.h | 28 | ||||
| -rw-r--r-- | include/vm/seg_kmem.h | 30 |
136 files changed, 233 insertions, 3020 deletions
diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 3200222db..000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -SUBDIRS = fs linux rpc sharefs sys util vm - -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/splat-ctl.h \ - $(top_srcdir)/include/spl-ctl.h \ - $(top_srcdir)/include/strings.h \ - $(top_srcdir)/include/unistd.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am deleted file mode 100644 index e0da4b32a..000000000 --- a/include/fs/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/fs/fs_subr.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/fs -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/fs/fs_subr.h b/include/fs/fs_subr.h deleted file mode 100644 index 71f074205..000000000 --- a/include/fs/fs_subr.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_FS_FS_SUBR_H -#define _SPL_FS_FS_SUBR_H - -#endif /* SPL_FS_FS_SUBR_H */ diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am deleted file mode 100644 index 712e94ebe..000000000 --- a/include/linux/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/linux/bitops_compat.h \ - $(top_srcdir)/include/linux/compiler_compat.h \ - $(top_srcdir)/include/linux/delay_compat.h \ - $(top_srcdir)/include/linux/file_compat.h \ - $(top_srcdir)/include/linux/list_compat.h \ - $(top_srcdir)/include/linux/math64_compat.h \ - $(top_srcdir)/include/linux/mm_compat.h \ - $(top_srcdir)/include/linux/proc_compat.h \ - $(top_srcdir)/include/linux/rwsem_compat.h \ - $(top_srcdir)/include/linux/wait_compat.h \ - $(top_srcdir)/include/linux/zlib_compat.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/linux -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/linux/bitops_compat.h b/include/linux/bitops_compat.h deleted file mode 100644 index a62b628e8..000000000 --- a/include/linux/bitops_compat.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_BITOPS_COMPAT_H -#define _SPL_BITOPS_COMPAT_H - -#include <linux/bitops.h> - -#endif /* _SPL_BITOPS_COMPAT_H */ diff --git a/include/linux/compiler_compat.h b/include/linux/compiler_compat.h deleted file mode 100644 index 696d79572..000000000 --- a/include/linux/compiler_compat.h +++ /dev/null @@ -1,47 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_COMPILER_COMPAT_H -#define _SPL_COMPILER_COMPAT_H - -#include <linux/compiler.h> - -#ifndef ACCESS_ONCE -/* - * Prevent the compiler from merging or refetching accesses. The compiler - * is also forbidden from reordering successive instances of ACCESS_ONCE(), - * but only when the compiler is aware of some particular ordering. One way - * to make the compiler aware of ordering is to put the two invocations of - * ACCESS_ONCE() in different C statements. - * - * This macro does absolutely -nothing- to prevent the CPU from reordering, - * merging, or refetching absolutely anything at any time. Its main intended - * use is to mediate communication between process-level code and irq/NMI - * handlers, all running on the same CPU. - */ -/* Taken from 2.6.33.2 */ -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x)) -#endif - -#endif /* _SPL_COMPILER_COMPAT_H */ diff --git a/include/linux/delay_compat.h b/include/linux/delay_compat.h deleted file mode 100644 index c7a381100..000000000 --- a/include/linux/delay_compat.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2007-2013 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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_DELAY_COMPAT_H -#define _SPL_DELAY_COMPAT_H - -#include <linux/delay.h> -#include <linux/time.h> - -/* usleep_range() introduced in 2.6.36 */ -#ifndef HAVE_USLEEP_RANGE - -static inline void -usleep_range(unsigned long min, unsigned long max) -{ - unsigned int min_ms = min / USEC_PER_MSEC; - - if (min >= MAX_UDELAY_MS) - msleep(min_ms); - else - udelay(min); -} - -#endif /* HAVE_USLEEP_RANGE */ - -#endif /* _SPL_DELAY_COMPAT_H */ diff --git a/include/linux/file_compat.h b/include/linux/file_compat.h deleted file mode 100644 index 55ba2cc76..000000000 --- a/include/linux/file_compat.h +++ /dev/null @@ -1,140 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_FILE_COMPAT_H -#define _SPL_FILE_COMPAT_H - -#include <linux/fs.h> -#include <linux/uaccess.h> -#ifdef HAVE_FDTABLE_HEADER -#include <linux/fdtable.h> -#endif - -static inline struct file * -spl_filp_open(const char *name, int flags, int mode, int *err) -{ - struct file *filp = NULL; - int rc; - - filp = filp_open(name, flags, mode); - if (IS_ERR(filp)) { - rc = PTR_ERR(filp); - if (err) - *err = rc; - filp = NULL; - } - return (filp); -} - -#define spl_filp_close(f) filp_close(f, NULL) -#define spl_filp_poff(f) (&(f)->f_pos) -#define spl_filp_write(fp, b, s, p) (fp)->f_op->write((fp), (b), (s), p) - -static inline int -spl_filp_fallocate(struct file *fp, int mode, loff_t offset, loff_t len) -{ - int error = -EOPNOTSUPP; - -#ifdef HAVE_FILE_FALLOCATE - if (fp->f_op->fallocate) - error = fp->f_op->fallocate(fp, mode, offset, len); -#else -#ifdef HAVE_INODE_FALLOCATE - if (fp->f_dentry && fp->f_dentry->d_inode && - fp->f_dentry->d_inode->i_op->fallocate) - error = fp->f_dentry->d_inode->i_op->fallocate( - fp->f_dentry->d_inode, mode, offset, len); -#endif /* HAVE_INODE_FALLOCATE */ -#endif /* HAVE_FILE_FALLOCATE */ - - return (error); -} - -static inline ssize_t -spl_kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos) -{ -#if defined(HAVE_KERNEL_WRITE_PPOS) - return (kernel_write(file, buf, count, pos)); -#else - mm_segment_t saved_fs; - ssize_t ret; - - saved_fs = get_fs(); - set_fs(get_ds()); - - ret = vfs_write(file, (__force const char __user *)buf, count, pos); - - set_fs(saved_fs); - - return (ret); -#endif -} - -static inline ssize_t -spl_kernel_read(struct file *file, void *buf, size_t count, loff_t *pos) -{ -#if defined(HAVE_KERNEL_READ_PPOS) - return (kernel_read(file, buf, count, pos)); -#else - mm_segment_t saved_fs; - ssize_t ret; - - saved_fs = get_fs(); - set_fs(get_ds()); - - ret = vfs_read(file, (void __user *)buf, count, pos); - - set_fs(saved_fs); - - return (ret); -#endif -} - -#ifdef HAVE_2ARGS_VFS_FSYNC -#define spl_filp_fsync(fp, sync) vfs_fsync(fp, sync) -#else -#define spl_filp_fsync(fp, sync) vfs_fsync(fp, (fp)->f_dentry, sync) -#endif /* HAVE_2ARGS_VFS_FSYNC */ - -#ifdef HAVE_INODE_LOCK_SHARED -#define spl_inode_lock(ip) inode_lock(ip) -#define spl_inode_unlock(ip) inode_unlock(ip) -#define spl_inode_lock_shared(ip) inode_lock_shared(ip) -#define spl_inode_unlock_shared(ip) inode_unlock_shared(ip) -#define spl_inode_trylock(ip) inode_trylock(ip) -#define spl_inode_trylock_shared(ip) inode_trylock_shared(ip) -#define spl_inode_is_locked(ip) inode_is_locked(ip) -#define spl_inode_lock_nested(ip, s) inode_lock_nested(ip, s) -#else -#define spl_inode_lock(ip) mutex_lock(&(ip)->i_mutex) -#define spl_inode_unlock(ip) mutex_unlock(&(ip)->i_mutex) -#define spl_inode_lock_shared(ip) mutex_lock(&(ip)->i_mutex) -#define spl_inode_unlock_shared(ip) mutex_unlock(&(ip)->i_mutex) -#define spl_inode_trylock(ip) mutex_trylock(&(ip)->i_mutex) -#define spl_inode_trylock_shared(ip) mutex_trylock(&(ip)->i_mutex) -#define spl_inode_is_locked(ip) mutex_is_locked(&(ip)->i_mutex) -#define spl_inode_lock_nested(ip, s) mutex_lock_nested(&(ip)->i_mutex, s) -#endif - -#endif /* SPL_FILE_COMPAT_H */ diff --git a/include/linux/list_compat.h b/include/linux/list_compat.h deleted file mode 100644 index fece8ad34..000000000 --- a/include/linux/list_compat.h +++ /dev/null @@ -1,50 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_LIST_COMPAT_H -#define _SPL_LIST_COMPAT_H - -#include <linux/list.h> - -#ifndef list_for_each_entry_safe_reverse - -/* - * list_for_each_entry_safe_reverse - * @pos: the type * to use as a loop cursor. - * @n: another type * to use as temporary storage - * @head: the head for your list. - * @member: the name of the list_struct within the struct. - * - * Iterate backwards over list of given type, safe against removal - * of list entry. - */ -#define list_for_each_entry_safe_reverse(pos, n, head, member) \ - for (pos = list_entry((head)->prev, typeof(*pos), member), \ - n = list_entry(pos->member.prev, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = list_entry(n->member.prev, typeof(*n), member)) - -#endif /* list_for_each_entry_safe_reverse */ - -#endif /* SPL_LIST_COMPAT_H */ diff --git a/include/linux/math64_compat.h b/include/linux/math64_compat.h deleted file mode 100644 index c02f58479..000000000 --- a/include/linux/math64_compat.h +++ /dev/null @@ -1,33 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_MATH64_COMPAT_H -#define _SPL_MATH64_COMPAT_H - -#ifndef abs64 -/* CSTYLED */ -#define abs64(x) ({ uint64_t t = (x) >> 63; ((x) ^ t) - t; }) -#endif - -#endif /* _SPL_MATH64_COMPAT_H */ diff --git a/include/linux/proc_compat.h b/include/linux/proc_compat.h deleted file mode 100644 index 91d914e10..000000000 --- a/include/linux/proc_compat.h +++ /dev/null @@ -1,35 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_PROC_COMPAT_H -#define _SPL_PROC_COMPAT_H - -#include <linux/proc_fs.h> - -extern struct proc_dir_entry *proc_spl_kstat; - -int spl_proc_init(void); -void spl_proc_fini(void); - -#endif /* SPL_PROC_COMPAT_H */ diff --git a/include/linux/rwsem_compat.h b/include/linux/rwsem_compat.h deleted file mode 100644 index 7a0dcf8dc..000000000 --- a/include/linux/rwsem_compat.h +++ /dev/null @@ -1,68 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_RWSEM_COMPAT_H -#define _SPL_RWSEM_COMPAT_H - -#include <linux/rwsem.h> - -#if defined(CONFIG_PREEMPT_RT_FULL) -#define SPL_RWSEM_SINGLE_READER_VALUE (1) -#define SPL_RWSEM_SINGLE_WRITER_VALUE (0) -#elif defined(CONFIG_RWSEM_GENERIC_SPINLOCK) -#define SPL_RWSEM_SINGLE_READER_VALUE (1) -#define SPL_RWSEM_SINGLE_WRITER_VALUE (-1) -#else -#define SPL_RWSEM_SINGLE_READER_VALUE (RWSEM_ACTIVE_READ_BIAS) -#define SPL_RWSEM_SINGLE_WRITER_VALUE (RWSEM_ACTIVE_WRITE_BIAS) -#endif - -/* Linux 3.16 changed activity to count for rwsem-spinlock */ -#if defined(CONFIG_PREEMPT_RT_FULL) -#define RWSEM_COUNT(sem) sem->read_depth -#elif defined(HAVE_RWSEM_ACTIVITY) -#define RWSEM_COUNT(sem) sem->activity -/* Linux 4.8 changed count to an atomic_long_t for !rwsem-spinlock */ -#elif defined(HAVE_RWSEM_ATOMIC_LONG_COUNT) -#define RWSEM_COUNT(sem) atomic_long_read(&(sem)->count) -#else -#define RWSEM_COUNT(sem) sem->count -#endif - -int rwsem_tryupgrade(struct rw_semaphore *rwsem); - -#if defined(RWSEM_SPINLOCK_IS_RAW) -#define spl_rwsem_lock_irqsave(lk, fl) raw_spin_lock_irqsave(lk, fl) -#define spl_rwsem_unlock_irqrestore(lk, fl) \ - raw_spin_unlock_irqrestore(lk, fl) -#define spl_rwsem_trylock_irqsave(lk, fl) raw_spin_trylock_irqsave(lk, fl) -#else -#define spl_rwsem_lock_irqsave(lk, fl) spin_lock_irqsave(lk, fl) -#define spl_rwsem_unlock_irqrestore(lk, fl) spin_unlock_irqrestore(lk, fl) -#define spl_rwsem_trylock_irqsave(lk, fl) spin_trylock_irqsave(lk, fl) -#endif /* RWSEM_SPINLOCK_IS_RAW */ - -#define spl_rwsem_is_locked(rwsem) rwsem_is_locked(rwsem) - -#endif /* _SPL_RWSEM_COMPAT_H */ diff --git a/include/linux/zlib_compat.h b/include/linux/zlib_compat.h deleted file mode 100644 index 3c14285d2..000000000 --- a/include/linux/zlib_compat.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2011 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Brian Behlendorf <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_ZLIB_COMPAT_H -#define _SPL_ZLIB_COMPAT_H - -#include <linux/zlib.h> - -#ifdef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE -#define spl_zlib_deflate_workspacesize(wb, ml) \ - zlib_deflate_workspacesize(wb, ml) -#else -#define spl_zlib_deflate_workspacesize(wb, ml) \ - zlib_deflate_workspacesize() -#endif /* HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ - -#endif /* SPL_ZLIB_COMPAT_H */ diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am deleted file mode 100644 index cfc824685..000000000 --- a/include/rpc/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/rpc/types.h \ - $(top_srcdir)/include/rpc/xdr.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/rpc/types.h b/include/rpc/types.h deleted file mode 100644 index 4fb5415ab..000000000 --- a/include/rpc/types.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_RPC_TYPES_H -#define _SPL_RPC_TYPES_H - -typedef int bool_t; - -#endif /* SPL_RPC_TYPES_H */ diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am deleted file mode 100644 index 10e709325..000000000 --- a/include/sharefs/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/sharefs/share.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/sharefs/share.h b/include/sharefs/share.h deleted file mode 100644 index a5bf0e2e1..000000000 --- a/include/sharefs/share.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_SHARE_H -#define _SPL_SHARE_H - -#endif /* SPL_SHARE_H */ diff --git a/include/spl-ctl.h b/include/spl-ctl.h deleted file mode 100644 index 571887d1d..000000000 --- a/include/spl-ctl.h +++ /dev/null @@ -1,45 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _DEBUG_CTL_H -#define _DEBUG_CTL_H - -/* - * Contains shared definitions which both the user space - * and kernel space portions of splat must agree on. - */ -typedef struct spl_debug_header { - int ph_len; - int ph_flags; - int ph_subsys; - int ph_mask; - int ph_cpu_id; - int ph_sec; - long ph_usec; - int ph_stack; - int ph_pid; - int ph_line_num; -} spl_debug_header_t; - -#endif /* _DEBUG_CTL_H */ diff --git a/include/rpc/xdr.h b/include/spl/rpc/xdr.h index e349757d5..0b39b46cf 100644 --- a/include/rpc/xdr.h +++ b/include/spl/rpc/xdr.h @@ -23,7 +23,8 @@ #define _SPL_RPC_XDR_H #include <sys/types.h> -#include <rpc/types.h> + +typedef int bool_t; /* * XDR enums and types. diff --git a/include/sys/acl.h b/include/spl/sys/acl.h index 9fc79c025..9fc79c025 100644 --- a/include/sys/acl.h +++ b/include/spl/sys/acl.h diff --git a/include/spl/sys/atomic.h b/include/spl/sys/atomic.h new file mode 100644 index 000000000..51b547923 --- /dev/null +++ b/include/spl/sys/atomic.h @@ -0,0 +1,79 @@ +/* + * 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 <[email protected]>. + * UCRL-CODE-235197 + * + * This file is part of the SPL, Solaris Porting Layer. + * For details, see <http://zfsonlinux.org/>. + * + * 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 _SPL_ATOMIC_H +#define _SPL_ATOMIC_H + +#include <linux/module.h> +#include <linux/spinlock.h> +#include <sys/types.h> + +/* + * Map the atomic_* functions to the Linux counterparts. This relies on the + * fact that the atomic types are internally really a uint32 or uint64. If + * this were to change an alternate approach would be needed. + * + * N.B. Due to the limitations of the original API atomicity is not strictly + * preserved when using the 64-bit functions on a 32-bit system. In order + * to support this all consumers would need to be updated to use the Linux + * provided atomic_t and atomic64_t types. + */ +#define atomic_inc_32(v) atomic_inc((atomic_t *)(v)) +#define atomic_dec_32(v) atomic_dec((atomic_t *)(v)) +#define atomic_add_32(v, i) atomic_add((i), (atomic_t *)(v)) +#define atomic_sub_32(v, i) atomic_sub((i), (atomic_t *)(v)) +#define atomic_inc_32_nv(v) atomic_inc_return((atomic_t *)(v)) +#define atomic_dec_32_nv(v) atomic_dec_return((atomic_t *)(v)) +#define atomic_add_32_nv(v, i) atomic_add_return((i), (atomic_t *)(v)) +#define atomic_sub_32_nv(v, i) atomic_sub_return((i), (atomic_t *)(v)) +#define atomic_cas_32(v, x, y) atomic_cmpxchg((atomic_t *)(v), x, y) +#define atomic_swap_32(v, x) atomic_xchg((atomic_t *)(v), x) +#define atomic_inc_64(v) atomic64_inc((atomic64_t *)(v)) +#define atomic_dec_64(v) atomic64_dec((atomic64_t *)(v)) +#define atomic_add_64(v, i) atomic64_add((i), (atomic64_t *)(v)) +#define atomic_sub_64(v, i) atomic64_sub((i), (atomic64_t *)(v)) +#define atomic_inc_64_nv(v) atomic64_inc_return((atomic64_t *)(v)) +#define atomic_dec_64_nv(v) atomic64_dec_return((atomic64_t *)(v)) +#define atomic_add_64_nv(v, i) atomic64_add_return((i), (atomic64_t *)(v)) +#define atomic_sub_64_nv(v, i) atomic64_sub_return((i), (atomic64_t *)(v)) +#define atomic_cas_64(v, x, y) atomic64_cmpxchg((atomic64_t *)(v), x, y) +#define atomic_swap_64(v, x) atomic64_xchg((atomic64_t *)(v), x) + +#ifdef _LP64 +static __inline__ void * +atomic_cas_ptr(volatile void *target, void *cmp, void *newval) +{ + return ((void *)atomic_cas_64((volatile uint64_t *)target, + (uint64_t)cmp, (uint64_t)newval)); +} +#else /* _LP64 */ +static __inline__ void * +atomic_cas_ptr(volatile void *target, void *cmp, void *newval) +{ + return ((void *)atomic_cas_32((volatile uint32_t *)target, + (uint32_t)cmp, (uint32_t)newval)); +} +#endif /* _LP64 */ + +#endif /* _SPL_ATOMIC_H */ diff --git a/include/sys/byteorder.h b/include/spl/sys/byteorder.h index a0ff424f8..477707996 100644 --- a/include/sys/byteorder.h +++ b/include/spl/sys/byteorder.h @@ -28,6 +28,11 @@ #include <asm/byteorder.h> #include <sys/isa_defs.h> +#define BSWAP_8(x) ((x) & 0xff) +#define BSWAP_16(x) ((BSWAP_8(x) << 8) | BSWAP_8((x) >> 8)) +#define BSWAP_32(x) ((BSWAP_16(x) << 16) | BSWAP_16((x) >> 16)) +#define BSWAP_64(x) ((BSWAP_32(x) << 32) | BSWAP_32((x) >> 32)) + #define LE_16(x) cpu_to_le16(x) #define LE_32(x) cpu_to_le32(x) #define LE_64(x) cpu_to_le64(x) diff --git a/include/sys/callb.h b/include/spl/sys/callb.h index f1826bfd3..f1826bfd3 100644 --- a/include/sys/callb.h +++ b/include/spl/sys/callb.h diff --git a/include/sys/callo.h b/include/spl/sys/callo.h index c43ac92e7..c43ac92e7 100644 --- a/include/sys/callo.h +++ b/include/spl/sys/callo.h diff --git a/include/sys/cmn_err.h b/include/spl/sys/cmn_err.h index 594a76333..be57358b0 100644 --- a/include/sys/cmn_err.h +++ b/include/spl/sys/cmn_err.h @@ -25,7 +25,7 @@ #ifndef _SPL_CMN_ERR_H #define _SPL_CMN_ERR_H -#include <sys/varargs.h> +#include <stdarg.h> #define CE_CONT 0 /* continuation */ #define CE_NOTE 1 /* notice */ @@ -34,8 +34,8 @@ #define CE_IGNORE 4 /* print nothing */ extern void cmn_err(int, const char *, ...); -extern void vcmn_err(int, const char *, __va_list); -extern void vpanic(const char *, __va_list); +extern void vcmn_err(int, const char *, va_list); +extern void vpanic(const char *, va_list); #define fm_panic panic diff --git a/include/sys/condvar.h b/include/spl/sys/condvar.h index 5fcc9068a..1d47cdd96 100644 --- a/include/sys/condvar.h +++ b/include/spl/sys/condvar.h @@ -26,11 +26,10 @@ #define _SPL_CONDVAR_H #include <linux/module.h> -#include <linux/wait_compat.h> -#include <linux/delay_compat.h> #include <sys/kmem.h> #include <sys/mutex.h> #include <sys/callo.h> +#include <sys/wait.h> /* * The kcondvar_t struct is protected by mutex taken externally before diff --git a/include/sys/console.h b/include/spl/sys/console.h index 3469cb762..3469cb762 100644 --- a/include/sys/console.h +++ b/include/spl/sys/console.h diff --git a/include/sys/cred.h b/include/spl/sys/cred.h index e4b18b665..fd063399b 100644 --- a/include/sys/cred.h +++ b/include/spl/sys/cred.h @@ -26,6 +26,7 @@ #define _SPL_CRED_H #include <linux/module.h> +#include <linux/cred.h> #include <sys/types.h> #include <sys/vfs.h> diff --git a/include/sys/ctype.h b/include/spl/sys/ctype.h index 18beb1daa..18beb1daa 100644 --- a/include/sys/ctype.h +++ b/include/spl/sys/ctype.h diff --git a/include/sys/debug.h b/include/spl/sys/debug.h index a4a458066..a4a458066 100644 --- a/include/sys/debug.h +++ b/include/spl/sys/debug.h diff --git a/include/sys/disp.h b/include/spl/sys/disp.h index 413b623c8..413b623c8 100644 --- a/include/sys/disp.h +++ b/include/spl/sys/disp.h diff --git a/include/sys/dkio.h b/include/spl/sys/dkio.h index 49f166a9c..49f166a9c 100644 --- a/include/sys/dkio.h +++ b/include/spl/sys/dkio.h diff --git a/include/sys/dkioc_free_util.h b/include/spl/sys/dkioc_free_util.h index d519b2f8e..d519b2f8e 100644 --- a/include/sys/dkioc_free_util.h +++ b/include/spl/sys/dkioc_free_util.h diff --git a/include/sys/fcntl.h b/include/spl/sys/fcntl.h index 3faa5dad7..3faa5dad7 100644 --- a/include/sys/fcntl.h +++ b/include/spl/sys/fcntl.h diff --git a/include/sys/file.h b/include/spl/sys/file.h index b6c40aff2..05dbc0814 100644 --- a/include/sys/file.h +++ b/include/spl/sys/file.h @@ -25,7 +25,28 @@ #ifndef _SPL_FILE_H #define _SPL_FILE_H -#define FIGNORECASE 0x00080000 -#define FKIOCTL 0x80000000 +#define FIGNORECASE 0x00080000 +#define FKIOCTL 0x80000000 +#define ED_CASE_CONFLICT 0x10 + +#ifdef HAVE_INODE_LOCK_SHARED +#define spl_inode_lock(ip) inode_lock(ip) +#define spl_inode_unlock(ip) inode_unlock(ip) +#define spl_inode_lock_shared(ip) inode_lock_shared(ip) +#define spl_inode_unlock_shared(ip) inode_unlock_shared(ip) +#define spl_inode_trylock(ip) inode_trylock(ip) +#define spl_inode_trylock_shared(ip) inode_trylock_shared(ip) +#define spl_inode_is_locked(ip) inode_is_locked(ip) +#define spl_inode_lock_nested(ip, s) inode_lock_nested(ip, s) +#else +#define spl_inode_lock(ip) mutex_lock(&(ip)->i_mutex) +#define spl_inode_unlock(ip) mutex_unlock(&(ip)->i_mutex) +#define spl_inode_lock_shared(ip) mutex_lock(&(ip)->i_mutex) +#define spl_inode_unlock_shared(ip) mutex_unlock(&(ip)->i_mutex) +#define spl_inode_trylock(ip) mutex_trylock(&(ip)->i_mutex) +#define spl_inode_trylock_shared(ip) mutex_trylock(&(ip)->i_mutex) +#define spl_inode_is_locked(ip) mutex_is_locked(&(ip)->i_mutex) +#define spl_inode_lock_nested(ip, s) mutex_lock_nested(&(ip)->i_mutex, s) +#endif #endif /* SPL_FILE_H */ diff --git a/include/sys/inttypes.h b/include/spl/sys/inttypes.h index 92e76206b..92e76206b 100644 --- a/include/sys/inttypes.h +++ b/include/spl/sys/inttypes.h diff --git a/include/sys/isa_defs.h b/include/spl/sys/isa_defs.h index 089ae0f85..089ae0f85 100644 --- a/include/sys/isa_defs.h +++ b/include/spl/sys/isa_defs.h diff --git a/include/sys/kmem.h b/include/spl/sys/kmem.h index d6b428551..d6b428551 100644 --- a/include/sys/kmem.h +++ b/include/spl/sys/kmem.h diff --git a/include/sys/kmem_cache.h b/include/spl/sys/kmem_cache.h index 8fa14f67e..8fa14f67e 100644 --- a/include/sys/kmem_cache.h +++ b/include/spl/sys/kmem_cache.h diff --git a/include/sys/kobj.h b/include/spl/sys/kobj.h index 558ec39a8..558ec39a8 100644 --- a/include/sys/kobj.h +++ b/include/spl/sys/kobj.h diff --git a/include/sys/kstat.h b/include/spl/sys/kstat.h index e9aff7386..9170fe24e 100644 --- a/include/sys/kstat.h +++ b/include/spl/sys/kstat.h @@ -26,11 +26,11 @@ #define _SPL_KSTAT_H #include <linux/module.h> -#include <linux/proc_compat.h> #include <sys/types.h> #include <sys/time.h> #include <sys/kmem.h> #include <sys/mutex.h> +#include <sys/proc.h> #define KSTAT_STRLEN 255 #define KSTAT_RAW_MAX (128*1024) diff --git a/include/sys/list.h b/include/spl/sys/list.h index d80c8474e..74b784e93 100644 --- a/include/sys/list.h +++ b/include/spl/sys/list.h @@ -72,10 +72,6 @@ list_link_init(list_node_t *node) static inline void list_create(list_t *list, size_t size, size_t offset) { - ASSERT(list); - ASSERT(size > 0); - ASSERT(size >= offset + sizeof (list_node_t)); - list->list_size = size; list->list_offset = offset; INIT_LIST_HEAD(&list->list_head); @@ -84,9 +80,6 @@ list_create(list_t *list, size_t size, size_t offset) static inline void list_destroy(list_t *list) { - ASSERT(list); - ASSERT(list_is_empty(list)); - list_del(&list->list_head); } @@ -123,7 +116,6 @@ list_insert_before(list_t *list, void *object, void *nobject) static inline void list_remove(list_t *list, void *object) { - ASSERT(!list_is_empty(list)); list_del(list_d2l(list, object)); } @@ -206,9 +198,6 @@ spl_list_move_tail(list_t *dst, list_t *src) static inline void list_link_replace(list_node_t *old_node, list_node_t *new_node) { - ASSERT(list_link_active(old_node)); - ASSERT(!list_link_active(new_node)); - new_node->next = old_node->next; new_node->prev = old_node->prev; old_node->prev->next = new_node; diff --git a/include/sys/mode.h b/include/spl/sys/mode.h index 02802d0d4..02802d0d4 100644 --- a/include/sys/mode.h +++ b/include/spl/sys/mode.h diff --git a/include/sys/mutex.h b/include/spl/sys/mutex.h index c7084b3c3..f906d49d4 100644 --- a/include/sys/mutex.h +++ b/include/spl/sys/mutex.h @@ -27,7 +27,6 @@ #include <sys/types.h> #include <linux/mutex.h> -#include <linux/compiler_compat.h> #include <linux/lockdep.h> typedef enum { diff --git a/include/sys/param.h b/include/spl/sys/param.h index 4ef929151..4ef929151 100644 --- a/include/sys/param.h +++ b/include/spl/sys/param.h diff --git a/include/sys/proc.h b/include/spl/sys/proc.h index 95fc8cc5f..287683920 100644 --- a/include/sys/proc.h +++ b/include/spl/sys/proc.h @@ -25,4 +25,11 @@ #ifndef _SPL_PROC_H #define _SPL_PROC_H +#include <linux/proc_fs.h> + +extern struct proc_dir_entry *proc_spl_kstat; + +int spl_proc_init(void); +void spl_proc_fini(void); + #endif /* SPL_PROC_H */ diff --git a/include/sys/processor.h b/include/spl/sys/processor.h index a70101fa2..a70101fa2 100644 --- a/include/sys/processor.h +++ b/include/spl/sys/processor.h diff --git a/include/sys/random.h b/include/spl/sys/random.h index 93e244f56..93e244f56 100644 --- a/include/sys/random.h +++ b/include/spl/sys/random.h diff --git a/include/sys/rwlock.h b/include/spl/sys/rwlock.h index bb8b785e8..b44ceab66 100644 --- a/include/sys/rwlock.h +++ b/include/spl/sys/rwlock.h @@ -27,7 +27,43 @@ #include <sys/types.h> #include <linux/rwsem.h> -#include <linux/rwsem_compat.h> + +/* Linux kernel compatibility */ +#if defined(CONFIG_PREEMPT_RT_FULL) +#define SPL_RWSEM_SINGLE_READER_VALUE (1) +#define SPL_RWSEM_SINGLE_WRITER_VALUE (0) +#elif defined(CONFIG_RWSEM_GENERIC_SPINLOCK) +#define SPL_RWSEM_SINGLE_READER_VALUE (1) +#define SPL_RWSEM_SINGLE_WRITER_VALUE (-1) +#else +#define SPL_RWSEM_SINGLE_READER_VALUE (RWSEM_ACTIVE_READ_BIAS) +#define SPL_RWSEM_SINGLE_WRITER_VALUE (RWSEM_ACTIVE_WRITE_BIAS) +#endif + +/* Linux 3.16 changed activity to count for rwsem-spinlock */ +#if defined(CONFIG_PREEMPT_RT_FULL) +#define RWSEM_COUNT(sem) sem->read_depth +#elif defined(HAVE_RWSEM_ACTIVITY) +#define RWSEM_COUNT(sem) sem->activity +/* Linux 4.8 changed count to an atomic_long_t for !rwsem-spinlock */ +#elif defined(HAVE_RWSEM_ATOMIC_LONG_COUNT) +#define RWSEM_COUNT(sem) atomic_long_read(&(sem)->count) +#else +#define RWSEM_COUNT(sem) sem->count +#endif + +#if defined(RWSEM_SPINLOCK_IS_RAW) +#define spl_rwsem_lock_irqsave(lk, fl) raw_spin_lock_irqsave(lk, fl) +#define spl_rwsem_unlock_irqrestore(lk, fl) \ + raw_spin_unlock_irqrestore(lk, fl) +#define spl_rwsem_trylock_irqsave(lk, fl) raw_spin_trylock_irqsave(lk, fl) +#else +#define spl_rwsem_lock_irqsave(lk, fl) spin_lock_irqsave(lk, fl) +#define spl_rwsem_unlock_irqrestore(lk, fl) spin_unlock_irqrestore(lk, fl) +#define spl_rwsem_trylock_irqsave(lk, fl) spin_trylock_irqsave(lk, fl) +#endif /* RWSEM_SPINLOCK_IS_RAW */ + +#define spl_rwsem_is_locked(rwsem) rwsem_is_locked(rwsem) typedef enum { RW_DRIVER = 2, @@ -232,5 +268,6 @@ RW_LOCK_HELD(krwlock_t *rwp) int spl_rw_init(void); void spl_rw_fini(void); +int rwsem_tryupgrade(struct rw_semaphore *rwsem); #endif /* _SPL_RWLOCK_H */ diff --git a/include/linux/mm_compat.h b/include/spl/sys/shrinker.h index c10652efd..28c1fa78c 100644 --- a/include/linux/mm_compat.h +++ b/include/spl/sys/shrinker.h @@ -22,8 +22,8 @@ * with the SPL. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SPL_MM_COMPAT_H -#define _SPL_MM_COMPAT_H +#ifndef _SPL_SHRINKER_H +#define _SPL_SHRINKER_H #include <linux/mm.h> #include <linux/fs.h> @@ -206,4 +206,4 @@ typedef int spl_shrinker_t; #define SHRINK_STOP (-1) #endif -#endif /* SPL_MM_COMPAT_H */ +#endif /* SPL_SHRINKER_H */ diff --git a/include/sys/sid.h b/include/spl/sys/sid.h index 731b62c47..731b62c47 100644 --- a/include/sys/sid.h +++ b/include/spl/sys/sid.h diff --git a/include/sys/signal.h b/include/spl/sys/signal.h index 36b8b5d98..36b8b5d98 100644 --- a/include/sys/signal.h +++ b/include/spl/sys/signal.h diff --git a/include/sys/stat.h b/include/spl/sys/stat.h index 83018e894..83018e894 100644 --- a/include/sys/stat.h +++ b/include/spl/sys/stat.h diff --git a/include/sys/idmap.h b/include/spl/sys/strings.h index abbfcbed1..4fb803206 100644 --- a/include/sys/idmap.h +++ b/include/spl/sys/strings.h @@ -1,7 +1,6 @@ /* - * Copyright (C) 2010 Lawrence Livermore National Security, LLC. + * Copyright (C) 2018 Lawrence Livermore National Security, LLC. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Brian Behlendorf <[email protected]>. * UCRL-CODE-235197 * * This file is part of the SPL, Solaris Porting Layer. @@ -20,10 +19,13 @@ * 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 _SPL_SYS_STRINGS_H +#define _SPL_SYS_STRINGS_H -#ifndef _SPL_IDMAP_H -#define _SPL_IDMAP_H +#include <linux/string.h> -#define IDMAP_WK_CREATOR_OWNER_UID 2147483648U +#define bzero(ptr, size) memset(ptr, 0, size) +#define bcopy(src, dest, size) memmove(dest, src, size) +#define bcmp(src, dest, size) memcmp((src), (dest), (size_t)(size)) -#endif /* SPL_IDMAP_H */ +#endif /* _SPL_SYS_STRINGS_H */ diff --git a/include/sys/sunddi.h b/include/spl/sys/sunddi.h index 1bae594c8..29a6fe00d 100644 --- a/include/sys/sunddi.h +++ b/include/spl/sys/sunddi.h @@ -27,7 +27,6 @@ #include <sys/cred.h> #include <sys/uio.h> -#include <sys/sunldi.h> #include <sys/mutex.h> #include <sys/u8_textprep.h> #include <sys/vnode.h> diff --git a/include/sys/sysmacros.h b/include/spl/sys/sysmacros.h index d083cebda..839e7fd8c 100644 --- a/include/sys/sysmacros.h +++ b/include/spl/sys/sysmacros.h @@ -29,7 +29,6 @@ #include <linux/sched.h> #include <linux/cpumask.h> #include <sys/debug.h> -#include <sys/varargs.h> #include <sys/zone.h> #include <sys/signal.h> #include <asm/page.h> @@ -66,11 +65,10 @@ #define UINT64_MIN ULLONG_MIN #define NBBY 8 -#define ENOTSUP EOPNOTSUPP #define MAXMSGLEN 256 #define MAXNAMELEN 256 -#define MAXPATHLEN PATH_MAX +#define MAXPATHLEN 4096 #define MAXOFFSET_T LLONG_MAX #define MAXBSIZE 8192 #define DEV_BSIZE 512 @@ -117,19 +115,6 @@ #define PAGESHIFT PAGE_SHIFT #endif -/* from Solaris sys/byteorder.h */ -#define BSWAP_8(x) ((x) & 0xff) -#define BSWAP_16(x) ((BSWAP_8(x) << 8) | BSWAP_8((x) >> 8)) -#define BSWAP_32(x) ((BSWAP_16(x) << 16) | BSWAP_16((x) >> 16)) -#define BSWAP_64(x) ((BSWAP_32(x) << 32) | BSWAP_32((x) >> 32)) - -/* - * Map some simple functions. - */ -#define bzero(ptr, size) memset(ptr, 0, size) -#define bcopy(src, dest, size) memmove(dest, src, size) -#define bcmp(src, dest, size) memcmp((src), (dest), (size_t)(size)) - /* Dtrace probes do not exist in the linux kernel */ #ifdef DTRACE_PROBE #undef DTRACE_PROBE diff --git a/include/sys/systeminfo.h b/include/spl/sys/systeminfo.h index 225569158..225569158 100644 --- a/include/sys/systeminfo.h +++ b/include/spl/sys/systeminfo.h diff --git a/include/sys/taskq.h b/include/spl/sys/taskq.h index 4d90a3563..7353367a2 100644 --- a/include/sys/taskq.h +++ b/include/spl/sys/taskq.h @@ -30,10 +30,10 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/kthread.h> -#include <linux/wait_compat.h> #include <sys/types.h> #include <sys/thread.h> #include <sys/rwlock.h> +#include <sys/wait.h> #define TASKQ_NAMELEN 31 diff --git a/include/sys/thread.h b/include/spl/sys/thread.h index 80cf49914..3762717da 100644 --- a/include/sys/thread.h +++ b/include/spl/sys/thread.h @@ -62,6 +62,8 @@ extern kthread_t *__thread_create(caddr_t stk, size_t stksize, int state, pri_t pri); extern void __thread_exit(void); extern struct task_struct *spl_kthread_create(int (*func)(void *), - void *data, const char namefmt[], ...); + void *data, const char namefmt[], ...); + +extern proc_t p0; #endif /* _SPL_THREAD_H */ diff --git a/include/sys/time.h b/include/spl/sys/time.h index d6aaca913..d6aaca913 100644 --- a/include/sys/time.h +++ b/include/spl/sys/time.h diff --git a/include/sys/timer.h b/include/spl/sys/timer.h index 821590e3a..a6b134570 100644 --- a/include/sys/timer.h +++ b/include/spl/sys/timer.h @@ -26,7 +26,9 @@ #define _SPL_TIMER_H #include <linux/module.h> +#include <linux/delay.h> #include <linux/sched.h> +#include <linux/time.h> #include <linux/timer.h> #define lbolt ((clock_t)jiffies) @@ -51,6 +53,20 @@ #define delay(ticks) schedule_timeout_uninterruptible(ticks) +/* usleep_range() introduced in 2.6.36 */ +#ifndef HAVE_USLEEP_RANGE +static inline void +usleep_range(unsigned long min, unsigned long max) +{ + unsigned int min_ms = min / USEC_PER_MSEC; + + if (min >= MAX_UDELAY_MS) + msleep(min_ms); + else + udelay(min); +} +#endif /* HAVE_USLEEP_RANGE */ + #define SEC_TO_TICK(sec) ((sec) * HZ) #define MSEC_TO_TICK(ms) msecs_to_jiffies(ms) #define USEC_TO_TICK(us) usecs_to_jiffies(us) diff --git a/include/sys/tsd.h b/include/spl/sys/tsd.h index 39a291bf3..39a291bf3 100644 --- a/include/sys/tsd.h +++ b/include/spl/sys/tsd.h diff --git a/include/sys/types.h b/include/spl/sys/types.h index e159dda21..a5b478127 100644 --- a/include/sys/types.h +++ b/include/spl/sys/types.h @@ -26,7 +26,6 @@ #define _SPL_TYPES_H #include <linux/types.h> -#include <sys/sysmacros.h> #ifndef ULLONG_MAX #define ULLONG_MAX (~0ULL) @@ -36,33 +35,36 @@ #define LLONG_MAX ((long long)(~0ULL>>1)) #endif -typedef enum { B_FALSE = 0, B_TRUE = 1 } boolean_t; -typedef unsigned long intptr_t; -typedef unsigned long ulong_t; -typedef unsigned int uint_t; -typedef unsigned char uchar_t; -typedef unsigned long long u_longlong_t; -typedef unsigned long long u_offset_t; -typedef unsigned long long rlim64_t; -typedef long long longlong_t; -typedef long long offset_t; -typedef struct task_struct kthread_t; -typedef struct task_struct proc_t; -typedef short pri_t; -typedef struct timespec timestruc_t; /* definition per SVr4 */ -typedef struct timespec timespec_t; -typedef longlong_t hrtime_t; -typedef unsigned short ushort_t; -typedef u_longlong_t len_t; -typedef longlong_t diskaddr_t; -typedef ushort_t o_mode_t; -typedef uint_t major_t; -typedef uint_t minor_t; -typedef ulong_t pgcnt_t; -typedef long spgcnt_t; -typedef short index_t; -typedef int id_t; +typedef enum { + B_FALSE = 0, + B_TRUE = 1 +} boolean_t; -extern proc_t p0; +typedef unsigned char uchar_t; +typedef unsigned short ushort_t; +typedef unsigned int uint_t; +typedef unsigned long ulong_t; +typedef unsigned long long u_longlong_t; +typedef long long longlong_t; + +typedef unsigned long intptr_t; +typedef unsigned long long rlim64_t; + +typedef struct task_struct kthread_t; +typedef struct task_struct proc_t; + +typedef struct timespec timestruc_t; +typedef struct timespec timespec_t; +typedef longlong_t hrtime_t; + +typedef int id_t; +typedef short pri_t; +typedef short index_t; +typedef longlong_t offset_t; +typedef u_longlong_t u_offset_t; +typedef ulong_t pgcnt_t; + +typedef int major_t; +typedef int minor_t; #endif /* _SPL_TYPES_H */ diff --git a/include/sys/types32.h b/include/spl/sys/types32.h index 1b05b2a47..c60ba8c97 100644 --- a/include/sys/types32.h +++ b/include/spl/sys/types32.h @@ -25,7 +25,6 @@ #ifndef _SPL_TYPES32_H #define _SPL_TYPES32_H -#include <sys/int_types.h> #include <sys/types.h> typedef uint32_t caddr32_t; diff --git a/include/sys/uio.h b/include/spl/sys/uio.h index 64c452b8d..64c452b8d 100644 --- a/include/sys/uio.h +++ b/include/spl/sys/uio.h diff --git a/include/sys/user.h b/include/spl/sys/user.h index b12cb240e..b12cb240e 100644 --- a/include/sys/user.h +++ b/include/spl/sys/user.h diff --git a/include/sys/vfs.h b/include/spl/sys/vfs.h index 0d5e1d51d..0d5e1d51d 100644 --- a/include/sys/vfs.h +++ b/include/spl/sys/vfs.h diff --git a/include/sys/vmem.h b/include/spl/sys/vmem.h index a9b12eeb9..a9b12eeb9 100644 --- a/include/sys/vmem.h +++ b/include/spl/sys/vmem.h diff --git a/include/sys/vmsystm.h b/include/spl/sys/vmsystm.h index 2b48fe0e3..2b48fe0e3 100644 --- a/include/sys/vmsystm.h +++ b/include/spl/sys/vmsystm.h diff --git a/include/sys/vnode.h b/include/spl/sys/vnode.h index 946654b7b..a3f7828e7 100644 --- a/include/sys/vnode.h +++ b/include/spl/sys/vnode.h @@ -41,7 +41,6 @@ #include <sys/time.h> #include <sys/uio.h> #include <sys/user.h> -#include <sys/sunldi.h> /* * Prior to linux-2.6.33 only O_DSYNC semantics were implemented and diff --git a/include/linux/wait_compat.h b/include/spl/sys/wait.h index 10fe2d896..5311ff8b9 100644 --- a/include/linux/wait_compat.h +++ b/include/spl/sys/wait.h @@ -22,8 +22,8 @@ * with the SPL. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SPL_WAIT_COMPAT_H -#define _SPL_WAIT_COMPAT_H +#ifndef _SPL_WAIT_H +#define _SPL_WAIT_H #include <linux/sched.h> #include <linux/wait.h> @@ -52,4 +52,4 @@ typedef wait_queue_head_t spl_wait_queue_head_t; typedef wait_queue_t spl_wait_queue_entry_t; #endif -#endif /* SPL_WAIT_COMPAT_H */ +#endif /* SPL_WAIT_H */ diff --git a/include/sys/zmod.h b/include/spl/sys/zmod.h index 5380bd6fd..95c1a3ed7 100644 --- a/include/sys/zmod.h +++ b/include/spl/sys/zmod.h @@ -59,6 +59,14 @@ #include <sys/types.h> #include <linux/zlib.h> +#ifdef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE +#define spl_zlib_deflate_workspacesize(wb, ml) \ + zlib_deflate_workspacesize(wb, ml) +#else +#define spl_zlib_deflate_workspacesize(wb, ml) \ + zlib_deflate_workspacesize() +#endif /* HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + extern int z_compress_level(void *dest, size_t *destLen, const void *source, size_t sourceLen, int level); extern int z_uncompress(void *dest, size_t *destLen, const void *source, diff --git a/include/sys/zone.h b/include/spl/sys/zone.h index b2efd13b8..b2efd13b8 100644 --- a/include/sys/zone.h +++ b/include/spl/sys/zone.h diff --git a/include/splat-ctl.h b/include/splat-ctl.h deleted file mode 100644 index 0f020dc24..000000000 --- a/include/splat-ctl.h +++ /dev/null @@ -1,109 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPLAT_CTL_H -#define _SPLAT_CTL_H - -#include <linux/types.h> - -/* - * Contains shared definitions for both user space and kernel space. To - * ensure 32-bit/64-bit interoperability over ioctl()'s only types with - * fixed sizes can be used. - */ -#define SPLAT_NAME "splatctl" -#define SPLAT_DEV "/dev/splatctl" - -#define SPLAT_NAME_SIZE 20 -#define SPLAT_DESC_SIZE 60 - -typedef struct splat_user { - char name[SPLAT_NAME_SIZE]; /* Short name */ - char desc[SPLAT_DESC_SIZE]; /* Short description */ - __u32 id; /* Unique numeric id */ -} splat_user_t; - -#define SPLAT_CFG_MAGIC 0x15263748U -typedef struct splat_cfg { - __u32 cfg_magic; /* Unique magic */ - __u32 cfg_cmd; /* Configure command */ - __s32 cfg_arg1; /* Configure command arg 1 */ - __s32 cfg_rc1; /* Configure response 1 */ - union { - struct { - __u32 size; - splat_user_t descs[0]; - } splat_subsystems; - struct { - __u32 size; - splat_user_t descs[0]; - } splat_tests; - } cfg_data; -} splat_cfg_t; - -#define SPLAT_CMD_MAGIC 0x9daebfc0U -typedef struct splat_cmd { - __u32 cmd_magic; /* Unique magic */ - __u32 cmd_subsystem; /* Target subsystem */ - __u32 cmd_test; /* Subsystem test */ - __u32 cmd_data_size; /* Opaque data size */ - char cmd_data_str[0]; /* Opaque data region */ -} splat_cmd_t; - -/* Valid ioctls */ -#define SPLAT_CFG _IOWR('f', 101, splat_cfg_t) -#define SPLAT_CMD _IOWR('f', 102, splat_cmd_t) - -/* Valid configuration commands */ -#define SPLAT_CFG_BUFFER_CLEAR 0x001 /* Clear text buffer */ -#define SPLAT_CFG_BUFFER_SIZE 0x002 /* Resize text buffer */ -#define SPLAT_CFG_SUBSYSTEM_COUNT 0x101 /* Number of subsystem */ -#define SPLAT_CFG_SUBSYSTEM_LIST 0x102 /* List of N subsystems */ -#define SPLAT_CFG_TEST_COUNT 0x201 /* Number of tests */ -#define SPLAT_CFG_TEST_LIST 0x202 /* List of N tests */ - -/* - * Valid subsystem and test commands are defined in each subsystem as - * SPLAT_SUBSYSTEM_*. We do need to be careful to avoid collisions, the - * currently defined subsystems are as follows: - */ -#define SPLAT_SUBSYSTEM_KMEM 0x0100 -#define SPLAT_SUBSYSTEM_TASKQ 0x0200 -#define SPLAT_SUBSYSTEM_KRNG 0x0300 -#define SPLAT_SUBSYSTEM_MUTEX 0x0400 -#define SPLAT_SUBSYSTEM_CONDVAR 0x0500 -#define SPLAT_SUBSYSTEM_THREAD 0x0600 -#define SPLAT_SUBSYSTEM_RWLOCK 0x0700 -#define SPLAT_SUBSYSTEM_TIME 0x0800 -#define SPLAT_SUBSYSTEM_VNODE 0x0900 -#define SPLAT_SUBSYSTEM_KOBJ 0x0a00 -#define SPLAT_SUBSYSTEM_ATOMIC 0x0b00 -#define SPLAT_SUBSYSTEM_LIST 0x0c00 -#define SPLAT_SUBSYSTEM_GENERIC 0x0d00 -#define SPLAT_SUBSYSTEM_CRED 0x0e00 -#define SPLAT_SUBSYSTEM_ZLIB 0x0f00 -#define SPLAT_SUBSYSTEM_LINUX 0x1000 -#define SPLAT_SUBSYSTEM_UNKNOWN 0xff00 - -#endif /* _SPLAT_CTL_H */ diff --git a/include/strings.h b/include/strings.h deleted file mode 100644 index 18179c79e..000000000 --- a/include/strings.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_STRINGS_H -#define _SPL_STRINGS_H - -#endif /* SPL_STRINGS_H */ diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am deleted file mode 100644 index 45b658976..000000000 --- a/include/sys/Makefile.am +++ /dev/null @@ -1,113 +0,0 @@ -SUBDIRS = fm fs - -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/sys/acl.h \ - $(top_srcdir)/include/sys/acl_impl.h \ - $(top_srcdir)/include/sys/atomic.h \ - $(top_srcdir)/include/sys/attr.h \ - $(top_srcdir)/include/sys/bitmap.h \ - $(top_srcdir)/include/sys/bootconf.h \ - $(top_srcdir)/include/sys/bootprops.h \ - $(top_srcdir)/include/sys/buf.h \ - $(top_srcdir)/include/sys/byteorder.h \ - $(top_srcdir)/include/sys/callb.h \ - $(top_srcdir)/include/sys/callo.h \ - $(top_srcdir)/include/sys/cmn_err.h \ - $(top_srcdir)/include/sys/compress.h \ - $(top_srcdir)/include/sys/condvar.h \ - $(top_srcdir)/include/sys/conf.h \ - $(top_srcdir)/include/sys/console.h \ - $(top_srcdir)/include/sys/cpupart.h \ - $(top_srcdir)/include/sys/cpuvar.h \ - $(top_srcdir)/include/sys/crc32.h \ - $(top_srcdir)/include/sys/cred.h \ - $(top_srcdir)/include/sys/ctype.h \ - $(top_srcdir)/include/sys/ddi.h \ - $(top_srcdir)/include/sys/debug.h \ - $(top_srcdir)/include/sys/dirent.h \ - $(top_srcdir)/include/sys/disp.h \ - $(top_srcdir)/include/sys/dkio.h \ - $(top_srcdir)/include/sys/dkioc_free_util.h \ - $(top_srcdir)/include/sys/dklabel.h \ - $(top_srcdir)/include/sys/dnlc.h \ - $(top_srcdir)/include/sys/dumphdr.h \ - $(top_srcdir)/include/sys/efi_partition.h \ - $(top_srcdir)/include/sys/errno.h \ - $(top_srcdir)/include/sys/extdirent.h \ - $(top_srcdir)/include/sys/fcntl.h \ - $(top_srcdir)/include/sys/file.h \ - $(top_srcdir)/include/sys/idmap.h \ - $(top_srcdir)/include/sys/int_limits.h \ - $(top_srcdir)/include/sys/int_types.h \ - $(top_srcdir)/include/sys/inttypes.h \ - $(top_srcdir)/include/sys/isa_defs.h \ - $(top_srcdir)/include/sys/kidmap.h \ - $(top_srcdir)/include/sys/kmem.h \ - $(top_srcdir)/include/sys/kmem_cache.h \ - $(top_srcdir)/include/sys/kobj.h \ - $(top_srcdir)/include/sys/kstat.h \ - $(top_srcdir)/include/sys/list.h \ - $(top_srcdir)/include/sys/mkdev.h \ - $(top_srcdir)/include/sys/mntent.h \ - $(top_srcdir)/include/sys/modctl.h \ - $(top_srcdir)/include/sys/mode.h \ - $(top_srcdir)/include/sys/mount.h \ - $(top_srcdir)/include/sys/mutex.h \ - $(top_srcdir)/include/sys/note.h \ - $(top_srcdir)/include/sys/open.h \ - $(top_srcdir)/include/sys/param.h \ - $(top_srcdir)/include/sys/pathname.h \ - $(top_srcdir)/include/sys/policy.h \ - $(top_srcdir)/include/sys/pool.h \ - $(top_srcdir)/include/sys/priv_impl.h \ - $(top_srcdir)/include/sys/processor.h \ - $(top_srcdir)/include/sys/proc.h \ - $(top_srcdir)/include/sys/pset.h \ - $(top_srcdir)/include/sys/random.h \ - $(top_srcdir)/include/sys/refstr.h \ - $(top_srcdir)/include/sys/resource.h \ - $(top_srcdir)/include/sys/rwlock.h \ - $(top_srcdir)/include/sys/sdt.h \ - $(top_srcdir)/include/sys/sid.h \ - $(top_srcdir)/include/sys/signal.h \ - $(top_srcdir)/include/sys/stat.h \ - $(top_srcdir)/include/sys/stropts.h \ - $(top_srcdir)/include/sys/sunddi.h \ - $(top_srcdir)/include/sys/sunldi.h \ - $(top_srcdir)/include/sys/sysdc.h \ - $(top_srcdir)/include/sys/sysmacros.h \ - $(top_srcdir)/include/sys/systeminfo.h \ - $(top_srcdir)/include/sys/systm.h \ - $(top_srcdir)/include/sys/taskq.h \ - $(top_srcdir)/include/sys/thread.h \ - $(top_srcdir)/include/sys/time.h \ - $(top_srcdir)/include/sys/timer.h \ - $(top_srcdir)/include/sys/t_lock.h \ - $(top_srcdir)/include/sys/tsd.h \ - $(top_srcdir)/include/sys/types32.h \ - $(top_srcdir)/include/sys/types.h \ - $(top_srcdir)/include/sys/u8_textprep.h \ - $(top_srcdir)/include/sys/uio.h \ - $(top_srcdir)/include/sys/unistd.h \ - $(top_srcdir)/include/sys/user.h \ - $(top_srcdir)/include/sys/va_list.h \ - $(top_srcdir)/include/sys/varargs.h \ - $(top_srcdir)/include/sys/vfs.h \ - $(top_srcdir)/include/sys/vfs_opreg.h \ - $(top_srcdir)/include/sys/vmem.h \ - $(top_srcdir)/include/sys/vmsystm.h \ - $(top_srcdir)/include/sys/vnode.h \ - $(top_srcdir)/include/sys/zmod.h \ - $(top_srcdir)/include/sys/zone.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys -kernel_HEADERS = $(KERNEL_H) -endif - diff --git a/include/sys/acl_impl.h b/include/sys/acl_impl.h deleted file mode 100644 index 9cb21124b..000000000 --- a/include/sys/acl_impl.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_ACL_IMPL_H -#define _SPL_ACL_IMPL_H - -#endif /* _SPL_ACL_IMPL_H */ diff --git a/include/sys/atomic.h b/include/sys/atomic.h deleted file mode 100644 index e992fdce3..000000000 --- a/include/sys/atomic.h +++ /dev/null @@ -1,313 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_ATOMIC_H -#define _SPL_ATOMIC_H - -#include <linux/module.h> -#include <linux/spinlock.h> -#include <sys/types.h> - -/* - * Two approaches to atomic operations are implemented each with its - * own benefits are drawbacks imposed by the Solaris API. Neither - * approach handles the issue of word breaking when using a 64-bit - * atomic variable on a 32-bit arch. The Solaris API would need to - * add an atomic read call to correctly support this. - * - * When ATOMIC_SPINLOCK is defined all atomic operations will be - * serialized through global spin locks. This is bad for performance - * but it does allow a simple generic implementation. - * - * When ATOMIC_SPINLOCK is not defined the Linux atomic operations - * are used. This is safe as long as the core Linux implementation - * doesn't change because we are relying on the fact that an atomic - * type is really just a uint32 or uint64. If this changes at some - * point in the future we need to fall-back to the spin approach. - */ -#ifdef ATOMIC_SPINLOCK -extern spinlock_t atomic32_lock; -extern spinlock_t atomic64_lock; - -static __inline__ void -atomic_inc_32(volatile uint32_t *target) -{ - spin_lock(&atomic32_lock); - (*target)++; - spin_unlock(&atomic32_lock); -} - -static __inline__ void -atomic_dec_32(volatile uint32_t *target) -{ - spin_lock(&atomic32_lock); - (*target)--; - spin_unlock(&atomic32_lock); -} - -static __inline__ void -atomic_add_32(volatile uint32_t *target, int32_t delta) -{ - spin_lock(&atomic32_lock); - *target += delta; - spin_unlock(&atomic32_lock); -} - -static __inline__ void -atomic_sub_32(volatile uint32_t *target, int32_t delta) -{ - spin_lock(&atomic32_lock); - *target -= delta; - spin_unlock(&atomic32_lock); -} - -static __inline__ uint32_t -atomic_inc_32_nv(volatile uint32_t *target) -{ - uint32_t nv; - - spin_lock(&atomic32_lock); - nv = ++(*target); - spin_unlock(&atomic32_lock); - - return (nv); -} - -static __inline__ uint32_t -atomic_dec_32_nv(volatile uint32_t *target) -{ - uint32_t nv; - - spin_lock(&atomic32_lock); - nv = --(*target); - spin_unlock(&atomic32_lock); - - return (nv); -} - -static __inline__ uint32_t -atomic_add_32_nv(volatile uint32_t *target, uint32_t delta) -{ - uint32_t nv; - - spin_lock(&atomic32_lock); - *target += delta; - nv = *target; - spin_unlock(&atomic32_lock); - - return (nv); -} - -static __inline__ uint32_t -atomic_sub_32_nv(volatile uint32_t *target, uint32_t delta) -{ - uint32_t nv; - - spin_lock(&atomic32_lock); - *target -= delta; - nv = *target; - spin_unlock(&atomic32_lock); - - return (nv); -} - -static __inline__ uint32_t -atomic_cas_32(volatile uint32_t *target, uint32_t cmp, uint32_t newval) -{ - uint32_t rc; - - spin_lock(&atomic32_lock); - rc = *target; - if (*target == cmp) - *target = newval; - - spin_unlock(&atomic32_lock); - - return (rc); -} - -static __inline__ uint32_t -atomic_swap_32(volatile uint32_t *target, uint32_t newval) -{ - uint32_t rc; - - spin_lock(&atomic32_lock); - rc = *target; - *target = newval; - spin_unlock(&atomic32_lock); - - return (rc); -} - -static __inline__ void -atomic_inc_64(volatile uint64_t *target) -{ - spin_lock(&atomic64_lock); - (*target)++; - spin_unlock(&atomic64_lock); -} - -static __inline__ void -atomic_dec_64(volatile uint64_t *target) -{ - spin_lock(&atomic64_lock); - (*target)--; - spin_unlock(&atomic64_lock); -} - -static __inline__ void -atomic_add_64(volatile uint64_t *target, uint64_t delta) -{ - spin_lock(&atomic64_lock); - *target += delta; - spin_unlock(&atomic64_lock); -} - -static __inline__ void -atomic_sub_64(volatile uint64_t *target, uint64_t delta) -{ - spin_lock(&atomic64_lock); - *target -= delta; - spin_unlock(&atomic64_lock); -} - -static __inline__ uint64_t -atomic_inc_64_nv(volatile uint64_t *target) -{ - uint64_t nv; - - spin_lock(&atomic64_lock); - nv = ++(*target); - spin_unlock(&atomic64_lock); - - return (nv); -} - -static __inline__ uint64_t -atomic_dec_64_nv(volatile uint64_t *target) -{ - uint64_t nv; - - spin_lock(&atomic64_lock); - nv = --(*target); - spin_unlock(&atomic64_lock); - - return (nv); -} - -static __inline__ uint64_t -atomic_add_64_nv(volatile uint64_t *target, uint64_t delta) -{ - uint64_t nv; - - spin_lock(&atomic64_lock); - *target += delta; - nv = *target; - spin_unlock(&atomic64_lock); - - return (nv); -} - -static __inline__ uint64_t -atomic_sub_64_nv(volatile uint64_t *target, uint64_t delta) -{ - uint64_t nv; - - spin_lock(&atomic64_lock); - *target -= delta; - nv = *target; - spin_unlock(&atomic64_lock); - - return (nv); -} - -static __inline__ uint64_t -atomic_cas_64(volatile uint64_t *target, uint64_t cmp, uint64_t newval) -{ - uint64_t rc; - - spin_lock(&atomic64_lock); - rc = *target; - if (*target == cmp) - *target = newval; - spin_unlock(&atomic64_lock); - - return (rc); -} - -static __inline__ uint64_t -atomic_swap_64(volatile uint64_t *target, uint64_t newval) -{ - uint64_t rc; - - spin_lock(&atomic64_lock); - rc = *target; - *target = newval; - spin_unlock(&atomic64_lock); - - return (rc); -} - -#else /* ATOMIC_SPINLOCK */ - -#define atomic_inc_32(v) atomic_inc((atomic_t *)(v)) -#define atomic_dec_32(v) atomic_dec((atomic_t *)(v)) -#define atomic_add_32(v, i) atomic_add((i), (atomic_t *)(v)) -#define atomic_sub_32(v, i) atomic_sub((i), (atomic_t *)(v)) -#define atomic_inc_32_nv(v) atomic_inc_return((atomic_t *)(v)) -#define atomic_dec_32_nv(v) atomic_dec_return((atomic_t *)(v)) -#define atomic_add_32_nv(v, i) atomic_add_return((i), (atomic_t *)(v)) -#define atomic_sub_32_nv(v, i) atomic_sub_return((i), (atomic_t *)(v)) -#define atomic_cas_32(v, x, y) atomic_cmpxchg((atomic_t *)(v), x, y) -#define atomic_swap_32(v, x) atomic_xchg((atomic_t *)(v), x) -#define atomic_inc_64(v) atomic64_inc((atomic64_t *)(v)) -#define atomic_dec_64(v) atomic64_dec((atomic64_t *)(v)) -#define atomic_add_64(v, i) atomic64_add((i), (atomic64_t *)(v)) -#define atomic_sub_64(v, i) atomic64_sub((i), (atomic64_t *)(v)) -#define atomic_inc_64_nv(v) atomic64_inc_return((atomic64_t *)(v)) -#define atomic_dec_64_nv(v) atomic64_dec_return((atomic64_t *)(v)) -#define atomic_add_64_nv(v, i) atomic64_add_return((i), (atomic64_t *)(v)) -#define atomic_sub_64_nv(v, i) atomic64_sub_return((i), (atomic64_t *)(v)) -#define atomic_cas_64(v, x, y) atomic64_cmpxchg((atomic64_t *)(v), x, y) -#define atomic_swap_64(v, x) atomic64_xchg((atomic64_t *)(v), x) - -#endif /* ATOMIC_SPINLOCK */ - -#ifdef _LP64 -static __inline__ void * -atomic_cas_ptr(volatile void *target, void *cmp, void *newval) -{ - return ((void *)atomic_cas_64((volatile uint64_t *)target, - (uint64_t)cmp, (uint64_t)newval)); -} -#else /* _LP64 */ -static __inline__ void * -atomic_cas_ptr(volatile void *target, void *cmp, void *newval) -{ - return ((void *)atomic_cas_32((volatile uint32_t *)target, - (uint32_t)cmp, (uint32_t)newval)); -} -#endif /* _LP64 */ - -#endif /* _SPL_ATOMIC_H */ diff --git a/include/sys/attr.h b/include/sys/attr.h deleted file mode 100644 index 7941acbec..000000000 --- a/include/sys/attr.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_ATTR_H -#define _SPL_ATTR_H - -#endif /* SPL_ATTR_H */ diff --git a/include/sys/bitmap.h b/include/sys/bitmap.h deleted file mode 100644 index 3e7d910c0..000000000 --- a/include/sys/bitmap.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_BITMAP_H -#define _SPL_BITMAP_H - -#endif /* SPL_BITMAP_H */ diff --git a/include/sys/bootconf.h b/include/sys/bootconf.h deleted file mode 100644 index 62730ba5d..000000000 --- a/include/sys/bootconf.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_BOOTCONF_H -#define _SPL_BOOTCONF_H - -#endif /* SPL_BOOTCONF_H */ diff --git a/include/sys/bootprops.h b/include/sys/bootprops.h deleted file mode 100644 index 50150eda9..000000000 --- a/include/sys/bootprops.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_BOOTPROPS_H -#define _SPL_BOOTPROPS_H - -#endif /* SPL_BOOTPROPS_H */ diff --git a/include/sys/buf.h b/include/sys/buf.h deleted file mode 100644 index fa453e478..000000000 --- a/include/sys/buf.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_BUF_H -#define _SPL_BUF_H - -#endif /* SPL_BUF_H */ diff --git a/include/sys/compress.h b/include/sys/compress.h deleted file mode 100644 index e46ab0df2..000000000 --- a/include/sys/compress.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_COMPRESS_H -#define _SPL_COMPRESS_H - -#endif /* SPL_COMPRESS_H */ diff --git a/include/sys/conf.h b/include/sys/conf.h deleted file mode 100644 index 68f4095dd..000000000 --- a/include/sys/conf.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_CONF_H -#define _SPL_CONF_H - -#endif /* SPL_CONF_H */ diff --git a/include/sys/cpupart.h b/include/sys/cpupart.h deleted file mode 100644 index ba57c19e8..000000000 --- a/include/sys/cpupart.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_CPUPART_H -#define _SPL_CPUPART_H - -#endif /* SPL_CPUPART_H */ diff --git a/include/sys/cpuvar.h b/include/sys/cpuvar.h deleted file mode 100644 index 075c06047..000000000 --- a/include/sys/cpuvar.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_CPUVAR_H -#define _SPL_CPUVAR_H - -#endif /* SPL_CPUVAR_H */ diff --git a/include/sys/crc32.h b/include/sys/crc32.h deleted file mode 100644 index eb021b1ff..000000000 --- a/include/sys/crc32.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_CRC32_H -#define _SPL_CRC32_H - -#endif /* SPL_CRC32_H */ diff --git a/include/sys/ddi.h b/include/sys/ddi.h deleted file mode 100644 index af2806ee7..000000000 --- a/include/sys/ddi.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_DDI_H -#define _SPL_DDI_H - -#endif /* SPL_DDI_H */ diff --git a/include/sys/dirent.h b/include/sys/dirent.h deleted file mode 100644 index 8237d0dd9..000000000 --- a/include/sys/dirent.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_DIRENT_H -#define _SPL_DIRENT_H - -#endif /* SPL_DIRENT_H */ diff --git a/include/sys/dklabel.h b/include/sys/dklabel.h deleted file mode 100644 index ff58059c6..000000000 --- a/include/sys/dklabel.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_DKLABEL_H -#define _SPL_DKLABEL_H - -#endif /* _SPL_DKLABEL_H */ diff --git a/include/sys/dnlc.h b/include/sys/dnlc.h deleted file mode 100644 index cda112c18..000000000 --- a/include/sys/dnlc.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_DNLC_H -#define _SPL_DNLC_H - -#endif /* SPL_DNLC_H */ diff --git a/include/sys/dumphdr.h b/include/sys/dumphdr.h deleted file mode 100644 index a452fe35d..000000000 --- a/include/sys/dumphdr.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_DUMPHDR_H -#define _SPL_DUMPHDR_H - -#endif /* SPL_DUMPHDR_H */ diff --git a/include/sys/efi_partition.h b/include/sys/efi_partition.h deleted file mode 100644 index d0c9c2005..000000000 --- a/include/sys/efi_partition.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_EFI_PARTITION_H -#define _SPL_EFI_PARTITION_H - -#endif /* SPL_EFI_PARTITION_H */ diff --git a/include/sys/errno.h b/include/sys/errno.h deleted file mode 100644 index 2dd378bc8..000000000 --- a/include/sys/errno.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_ERRNO_H -#define _SPL_ERRNO_H - -#endif /* SPL_ERRNO_H */ diff --git a/include/sys/extdirent.h b/include/sys/extdirent.h deleted file mode 100644 index e0567fa6e..000000000 --- a/include/sys/extdirent.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2010 Lawrence Livermore National Security, LLC. - * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Brian Behlendorf <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_EXTDIRENT_H -#define _SPL_EXTDIRENT_H - -#define ED_CASE_CONFLICT 0x10 - -#endif /* _SPL_EXTDIRENT_H */ diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am deleted file mode 100644 index 2821cbe33..000000000 --- a/include/sys/fm/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/sys/fm/protocol.h \ - $(top_srcdir)/include/sys/fm/util.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/sys/fm/protocol.h b/include/sys/fm/protocol.h deleted file mode 100644 index 39f6cb1e5..000000000 --- a/include/sys/fm/protocol.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_FM_PROTOCOL_H -#define _SPL_FM_PROTOCOL_H - -#endif /* _SPL_FM_PROTOCOL_H */ diff --git a/include/sys/fm/util.h b/include/sys/fm/util.h deleted file mode 100644 index d8f68433d..000000000 --- a/include/sys/fm/util.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_FM_UTIL_H -#define _SPL_FM_UTIL_H - -#endif /* _SPL_FM_UTIL_H */ diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am deleted file mode 100644 index 581083e9c..000000000 --- a/include/sys/fs/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/sys/fs/swapnode.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/sys/fs/swapnode.h b/include/sys/fs/swapnode.h deleted file mode 100644 index 1fa5fdc83..000000000 --- a/include/sys/fs/swapnode.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_SWAPNODE_H -#define _SPL_SWAPNODE_H - -#endif /* SPL_SWAPNODE_H */ diff --git a/include/sys/int_limits.h b/include/sys/int_limits.h deleted file mode 100644 index 5d7e9be89..000000000 --- a/include/sys/int_limits.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_INT_LIMITS_H -#define _SPL_INT_LIMITS_H - -#endif /* SPL_INT_LIMITS_H */ diff --git a/include/sys/int_types.h b/include/sys/int_types.h deleted file mode 100644 index 7e3b7329f..000000000 --- a/include/sys/int_types.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_INT_TYPES_H -#define _SPL_INT_TYPES_H - -#include <sys/inttypes.h> - -#endif /* SPL_INT_TYPES_H */ diff --git a/include/sys/kidmap.h b/include/sys/kidmap.h deleted file mode 100644 index a5e6375c3..000000000 --- a/include/sys/kidmap.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_KIDMAP_H -#define _SPL_KIDMAP_H - -#include <sys/idmap.h> - -#endif /* SPL_KIDMAP_H */ diff --git a/include/sys/mkdev.h b/include/sys/mkdev.h deleted file mode 100644 index 7dff2d22d..000000000 --- a/include/sys/mkdev.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_MKDEV_H -#define _SPL_MKDEV_H - -#endif /* SPL_MKDEV_H */ diff --git a/include/sys/mntent.h b/include/sys/mntent.h deleted file mode 100644 index cac28c530..000000000 --- a/include/sys/mntent.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_MNTENT_H -#define _SPL_MNTENT_H - -#endif /* SPL_MNTENT_H */ diff --git a/include/sys/modctl.h b/include/sys/modctl.h deleted file mode 100644 index 8f9ae496d..000000000 --- a/include/sys/modctl.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_MODCTL_H -#define _SPL_MODCTL_H - -#endif /* SPL_MODCTL_H */ diff --git a/include/sys/mount.h b/include/sys/mount.h deleted file mode 100644 index fdd1c6678..000000000 --- a/include/sys/mount.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_MOUNT_H -#define _SPL_MOUNT_H - -#endif /* SPL_MOUNT_H */ diff --git a/include/sys/note.h b/include/sys/note.h deleted file mode 100644 index f7f9b70ef..000000000 --- a/include/sys/note.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_NOTE_H -#define _SPL_NOTE_H - -#endif /* SPL_NOTE_H */ diff --git a/include/sys/open.h b/include/sys/open.h deleted file mode 100644 index 7c9e0cb7a..000000000 --- a/include/sys/open.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_OPEN_H -#define _SPL_OPEN_H - -#endif /* SPL_OPEN_H */ diff --git a/include/sys/pathname.h b/include/sys/pathname.h deleted file mode 100644 index fde1b3c1e..000000000 --- a/include/sys/pathname.h +++ /dev/null @@ -1,35 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_PATHNAME_H -#define _SPL_PATHNAME_H - -typedef struct pathname { - char *pn_buf; /* underlying storage */ - char *pn_path; /* remaining pathname */ - size_t pn_pathlen; /* remaining length */ - size_t pn_bufsize; /* total size of pn_buf */ -} pathname_t; - -#endif /* SPL_PATHNAME_H */ diff --git a/include/sys/policy.h b/include/sys/policy.h deleted file mode 100644 index e4333cfcf..000000000 --- a/include/sys/policy.h +++ /dev/null @@ -1,47 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_POLICY_H -#define _SPL_POLICY_H - -#define secpolicy_fs_unmount(c, vfs) (0) -#define secpolicy_nfs(c) (0) -#define secpolicy_sys_config(c, co) (0) -#define secpolicy_zfs(c) (0) -#define secpolicy_zinject(c) (0) -#define secpolicy_vnode_setids_setgids(c, id) (0) -#define secpolicy_vnode_setid_retain(c, sr) (0) -#define secpolicy_setid_clear(v, c) (0) -#define secpolicy_vnode_any_access(c, vp, o) (0) -#define secpolicy_vnode_access2(c, cp, o, m1, m2) (0) -#define secpolicy_vnode_chown(c, o) (0) -#define secpolicy_vnode_setdac(c, o) (0) -#define secpolicy_vnode_remove(c) (0) -#define secpolicy_vnode_setattr(c, v, a, o, f, func, n) (0) -#define secpolicy_xvattr(x, o, c, t) (0) -#define secpolicy_vnode_stky_modify(c) (0) -#define secpolicy_setid_setsticky_clear(v, a, o, c) (0) -#define secpolicy_basic_link(c) (0) - -#endif /* SPL_POLICY_H */ diff --git a/include/sys/pool.h b/include/sys/pool.h deleted file mode 100644 index 392c14b5e..000000000 --- a/include/sys/pool.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_POOL_H -#define _SPL_POOL_H - -#include <sys/pset.h> - -#endif /* SPL_POOL_H */ diff --git a/include/sys/priv_impl.h b/include/sys/priv_impl.h deleted file mode 100644 index 822c2dec1..000000000 --- a/include/sys/priv_impl.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_PRIV_IMPL_H -#define _SPL_PRIV_IMPL_H - -#endif /* _SPL_PRIV_IMPL_H */ diff --git a/include/sys/pset.h b/include/sys/pset.h deleted file mode 100644 index a6a9d343b..000000000 --- a/include/sys/pset.h +++ /dev/null @@ -1,38 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_PSET_H -#define _SPL_PSET_H - -typedef int psetid_t; - -/* special processor set id's */ -#define PS_NONE -1 -#define PS_QUERY -2 -#define PS_MYID -3 -#define PS_SOFT -4 -#define PS_HARD -5 -#define PS_QUERY_TYPE -6 - -#endif /* SPL_PSET_H */ diff --git a/include/sys/refstr.h b/include/sys/refstr.h deleted file mode 100644 index 1b54dab45..000000000 --- a/include/sys/refstr.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_REFSTR_H -#define _SPL_REFSTR_H - -#endif /* SPL_REFSTR_H */ diff --git a/include/sys/resource.h b/include/sys/resource.h deleted file mode 100644 index d1ffb6c2d..000000000 --- a/include/sys/resource.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_RESOURCE_H -#define _SPL_RESOURCE_H - -#include <linux/resource.h> - -#endif /* SPL_RESOURCE_H */ diff --git a/include/sys/sdt.h b/include/sys/sdt.h deleted file mode 100644 index 2d4679d65..000000000 --- a/include/sys/sdt.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_SDT_H -#define _SPL_SDT_H - -#define SET_ERROR(x) (x) - -#endif /* SPL_SDT_H */ diff --git a/include/sys/stropts.h b/include/sys/stropts.h deleted file mode 100644 index 746141fe8..000000000 --- a/include/sys/stropts.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_STROPTS_H -#define _SPL_STROPTS_H - -#endif /* SPL_STROPTS_H */ diff --git a/include/sys/sunldi.h b/include/sys/sunldi.h deleted file mode 100644 index a5045f891..000000000 --- a/include/sys/sunldi.h +++ /dev/null @@ -1,43 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_SUNLDI_H -#define _SPL_SUNLDI_H - -#include <sys/types.h> -#include <linux/fs.h> -#include <linux/genhd.h> -#include <linux/hdreg.h> -#include <linux/bio.h> -#include <linux/blkdev.h> - -/* - * SECTOR_SIZE can be defined in blkdev.h. See - * https://github.com/torvalds/linux/commit/233bde21. - */ -#ifndef SECTOR_SIZE -#define SECTOR_SIZE 512 -#endif - -#endif /* SPL_SUNLDI_H */ diff --git a/include/sys/sysdc.h b/include/sys/sysdc.h deleted file mode 100644 index d963774ac..000000000 --- a/include/sys/sysdc.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_SYSDC_H -#define _SPL_SYSDC_H - -#endif /* SPL_SYSDC_H */ diff --git a/include/sys/systm.h b/include/sys/systm.h deleted file mode 100644 index 2420e7e9d..000000000 --- a/include/sys/systm.h +++ /dev/null @@ -1,32 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_SYSTM_H -#define _SPL_SYSTM_H - -#include <sys/sunddi.h> - -typedef uintptr_t pc_t; - -#endif /* SPL_SYSTM_H */ diff --git a/include/sys/t_lock.h b/include/sys/t_lock.h deleted file mode 100644 index dcdfaeec5..000000000 --- a/include/sys/t_lock.h +++ /dev/null @@ -1,33 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_T_LOCK_H -#define _SPL_T_LOCK_H - -#include <sys/param.h> -#include <sys/mutex.h> -#include <sys/rwlock.h> -#include <sys/condvar.h> - -#endif /* SPL_T_LOCK_H */ diff --git a/include/sys/u8_textprep.h b/include/sys/u8_textprep.h deleted file mode 100644 index 6e76651d5..000000000 --- a/include/sys/u8_textprep.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_U8_TEXTPREP_H -#define _SPL_U8_TEXTPREP_H - -#endif /* SPL_U8_TEXTPREP_H */ diff --git a/include/sys/unistd.h b/include/sys/unistd.h deleted file mode 100644 index d86de891c..000000000 --- a/include/sys/unistd.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_UNISTD_H -#define _SPL_UNISTD_H - -#endif /* SPL_UNISTD_H */ diff --git a/include/sys/va_list.h b/include/sys/va_list.h deleted file mode 100644 index 62d18b9ae..000000000 --- a/include/sys/va_list.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_VA_LIST_H -#define _SPL_VA_LIST_H - -#endif /* SPL_VA_LIST_H */ diff --git a/include/sys/varargs.h b/include/sys/varargs.h deleted file mode 100644 index cdb73fbbd..000000000 --- a/include/sys/varargs.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_VARARGS_H -#define _SPL_VARARGS_H - -#define __va_list va_list - -#endif /* SPL_VARARGS_H */ diff --git a/include/sys/vfs_opreg.h b/include/sys/vfs_opreg.h deleted file mode 100644 index 1d48f2d5a..000000000 --- a/include/sys/vfs_opreg.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_OPREG_H -#define _SPL_OPREG_H - -#endif /* SPL_OPREG_H */ diff --git a/include/unistd.h b/include/unistd.h deleted file mode 100644 index d86de891c..000000000 --- a/include/unistd.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_UNISTD_H -#define _SPL_UNISTD_H - -#endif /* SPL_UNISTD_H */ diff --git a/include/util/Makefile.am b/include/util/Makefile.am deleted file mode 100644 index e2bf09fb1..000000000 --- a/include/util/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/util/qsort.h \ - $(top_srcdir)/include/util/sscanf.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/util -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/util/qsort.h b/include/util/qsort.h deleted file mode 100644 index 90ae6e4c2..000000000 --- a/include/util/qsort.h +++ /dev/null @@ -1,32 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_QSORT_H -#define _SPL_QSORT_H - -#include <linux/sort.h> - -#define qsort(base, num, size, cmp) sort(base, num, size, cmp, NULL) - -#endif /* SPL_QSORT_H */ diff --git a/include/util/sscanf.h b/include/util/sscanf.h deleted file mode 100644 index 9788234bb..000000000 --- a/include/util/sscanf.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_UTIL_SSCANF_H -#define _SPL_UTIL_SSCANF_H - -#endif /* SPL_UTIL_SSCAN_H */ diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am deleted file mode 100644 index 7faab0aab..000000000 --- a/include/vm/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/vm/anon.h \ - $(top_srcdir)/include/vm/pvn.h \ - $(top_srcdir)/include/vm/seg_kmem.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/vm -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/vm/anon.h b/include/vm/anon.h deleted file mode 100644 index 706734ff3..000000000 --- a/include/vm/anon.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_VM_ANON_H -#define _SPL_VM_ANON_H - -#endif /* SPL_VM_ANON_H */ diff --git a/include/vm/pvn.h b/include/vm/pvn.h deleted file mode 100644 index 1011e6cd8..000000000 --- a/include/vm/pvn.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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_VM_PVN_H -#define _SPL_VM_PVN_H - -#endif /* SPL_VM_PVN_H */ diff --git a/include/vm/seg_kmem.h b/include/vm/seg_kmem.h deleted file mode 100644 index a0ab7fce6..000000000 --- a/include/vm/seg_kmem.h +++ /dev/null @@ -1,30 +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 <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. - * - * 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 _SPL_SEG_KMEM_H -#define _SPL_SEG_KMEM_H - -#include <sys/vmsystm.h> - -#endif /* SPL_SEG_KMEM_H */ |