Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

lib/libspl/include/assert.h

@@ -26,8 +26,8 @@
 
 #include_next <assert.h>
 
-#ifndef _SOL_ASSERT_H
+#ifndef _LIBSPL_ASSERT_H
-#define _SOL_ASSERT_H
+#define _LIBSPL_ASSERT_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -91,4 +91,4 @@ _NOTE(CONSTCOND) } while (0)
 #define	ASSERT3P(x, y, z)	VERIFY3P(x, y, z)
 #endif  /* NDEBUG */
 
-#endif  /* _SOL_ASSERT_H */
+#endif  /* _LIBSPL_ASSERT_H */

lib/libspl/include/atomic.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef	_SYS_ATOMIC_H
+#ifndef	_LIBSPL_ATOMIC_H
-#define	_SYS_ATOMIC_H
+#define	_LIBSPL_ATOMIC_H
 
 
 
@@ -435,4 +435,4 @@ extern uint32_t swapl(uint32_t *, uint32_t);
 }
 #endif
 
-#endif	/* _SYS_ATOMIC_H */
+#endif	/* _LIBSPL_ATOMIC_H */

lib/libspl/include/devid.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _DEVID_H
+#ifndef _LIBSPL_DEVID_H
-#define _DEVID_H
+#define _LIBSPL_DEVID_H
 
 #include <stdlib.h>
 

lib/libspl/include/libdevinfo.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _LIBDEVINFO_H
+#ifndef _LIBSPL_LIBDEVINFO_H
-#define _LIBDEVINFO_H
+#define _LIBSPL_LIBDEVINFO_H
 
-#endif /* _LIBDEVINFO_H */
+#endif /* _LIBSPL_LIBDEVINFO_H */

lib/libspl/include/libshare.h

@@ -28,7 +28,7 @@
  * basic API declarations for share management
  */
 
-#ifndef _LIBSHARE_H
+#ifndef _LIBSPL_LIBSHARE_H
-#define _LIBSHARE_H
+#define _LIBSPL_LIBSHARE_H
 
-#endif /* _LIBSHARE_H */
+#endif /* _LIBSPL_LIBSHARE_H */

lib/libspl/include/priv.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _PRIV_H
+#ifndef _LIBSPL_PRIV_H
-#define _PRIV_H
+#define _LIBSPL_PRIV_H
 
 #include <sys/types.h>
 

lib/libspl/include/stdlib.h

@@ -26,8 +26,8 @@
 
 #include_next <stdlib.h>
 
-#ifndef _SOL_STDLIB_H
+#ifndef _LIBSPL_STDLIB_H
-#define _SOL_STDLIB_H
+#define _LIBSPL_STDLIB_H
 
 extern const char *getexecname(void);
 

lib/libspl/include/string.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_STRING_H
+#ifndef _LIBSPL_STRING_H
-#define _SOL_STRING_H
+#define _LIBSPL_STRING_H
 
 #include_next <string.h>
 

lib/libspl/include/strings.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_STRINGS_H
+#ifndef _LIBSPL_STRINGS_H
-#define _SOL_STRINGS_H
+#define _LIBSPL_STRINGS_H
 
 #include <string.h>
 #include_next <strings.h>

lib/libspl/include/synch.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYNCH_H
+#ifndef _LIBSPL_SYNCH_H
-#define _SOL_SYNCH_H
+#define _LIBSPL_SYNCH_H
 
 #endif

lib/libspl/include/sys/bitmap.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_BITMAP_H
+#ifndef _LIBSPL_SYS_BITMAP_H
-#define _SOL_SYS_BITMAP_H
+#define _LIBSPL_SYS_BITMAP_H
 
 #endif

lib/libspl/include/sys/cmn_err.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_CMN_ERR_H
+#ifndef _LIBSPL_SYS_CMN_ERR_H
-#define _SOL_SYS_CMN_ERR_H
+#define _LIBSPL_SYS_CMN_ERR_H
 
 #endif

lib/libspl/include/sys/cred.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_CRED_H
+#ifndef _LIBSPL_SYS_CRED_H
-#define _SOL_SYS_CRED_H
+#define _LIBSPL_SYS_CRED_H
 
 typedef struct cred cred_t;
 

lib/libspl/include/sys/debug.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_DEBUG_H
+#ifndef _LIBSPL_SYS_DEBUG_H
-#define _SOL_SYS_DEBUG_H
+#define _LIBSPL_SYS_DEBUG_H
 
 #include <assert.h>
 

lib/libspl/include/sys/file.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_FILE_H
+#ifndef _LIBSPL_SYS_FILE_H
-#define _SOL_SYS_FILE_H
+#define _LIBSPL_SYS_FILE_H
 
 #include_next <sys/file.h>
 

lib/libspl/include/sys/int_limits.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_INT_LIMITS_H
+#ifndef _LIBSPL_SYS_INT_LIMITS_H
-#define _SOL_SYS_INT_LIMITS_H
+#define _LIBSPL_SYS_INT_LIMITS_H
 
 #endif

lib/libspl/include/sys/mkdev.h

@@ -0,0 +1,30 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _LIBSPL_SYS_MKDEV_H
+#define _LIBSPL_SYS_MKDEV_H
+
+#endif

lib/libspl/include/sys/mount.h

@@ -26,8 +26,8 @@
 
 #include_next <sys/mount.h>
 
-#ifndef _SOL_SYS_MOUNT_H
+#ifndef _LIBSPL_SYS_MOUNT_H
-#define _SOL_SYS_MOUNT_H
+#define _LIBSPL_SYS_MOUNT_H
 
 #include <sys/mntent.h>
 #include <assert.h>
@@ -47,4 +47,4 @@
 #define MS_NOMNTTAB		0         /* Not supported in Linux */
 #define MS_OPTIONSTR		0         /* Not necessary in Linux */
 
-#endif /* _SOL_SYS_MOUNT_H */
+#endif /* _LIBSPL_SYS_MOUNT_H */

lib/libspl/include/sys/param.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_PARAM_H
+#ifndef _LIBSPL_SYS_PARAM_H
-#define _SOL_SYS_PARAM_H
+#define _LIBSPL_SYS_PARAM_H
 
 #include_next <sys/param.h>
 #include <unistd.h>

lib/libspl/include/sys/priv.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_PRIV_H
+#ifndef _LIBSPL_SYS_PRIV_H
-#define _SOL_SYS_PRIV_H
+#define _LIBSPL_SYS_PRIV_H
 
 #endif

lib/libspl/include/sys/processor.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_PROCESSOR_H
+#ifndef _LIBSPL_SYS_PROCESSOR_H
-#define _SOL_SYS_PROCESSOR_H
+#define _LIBSPL_SYS_PROCESSOR_H
 
 #define getcpuid() (-1)
 

lib/libspl/include/sys/sdt.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_SDT_H
+#ifndef _LIBSPL_SYS_SDT_H
-#define _SOL_SYS_SDT_H
+#define _LIBSPL_SYS_SDT_H
 
 #define DTRACE_PROBE1(a,b,c)             ((void) 0)
 #define DTRACE_PROBE2(a,b,c,d,e)         ((void) 0)

lib/libspl/include/sys/sysevent.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_SYSEVENT_H
+#ifndef _LIBSPL_SYS_SYSEVENT_H
-#define _SOL_SYS_SYSEVENT_H
+#define _LIBSPL_SYS_SYSEVENT_H
 
 #endif

lib/libspl/include/sys/sysmacros.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_SYSMACROS_H
+#ifndef _LIBSPL_SYS_SYSMACROS_H
-#define _SOL_SYS_SYSMACROS_H
+#define _LIBSPL_SYS_SYSMACROS_H
 
 #include_next <sys/sysmacros.h>
 
@@ -93,4 +93,4 @@
 #define	offsetof(s, m)	((size_t)(&(((s *)0)->m)))
 #endif
 
-#endif /* _SOL_SYS_SYSMACROS_H */
+#endif /* _LIBSPL_SYS_SYSMACROS_H */

lib/libspl/include/sys/systeminfo.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_SYSTEMINFO_H
+#ifndef _LIBSPL_SYS_SYSTEMINFO_H
-#define _SOL_SYS_SYSTEMINFO_H
+#define _LIBSPL_SYS_SYSTEMINFO_H
 
 #define sysinfo(cmd,buf,cnt)		(-1)
 

lib/libspl/include/sys/time.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_TIME_H
+#ifndef _LIBSPL_SYS_TIME_H
-#define _SOL_SYS_TIME_H
+#define _LIBSPL_SYS_TIME_H
 
 #include_next <sys/time.h>
 #include <sys/types.h>

lib/libspl/include/sys/types.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _PORT_SYS_TYPES_H
+#ifndef _LIBSPL_SYS_TYPES_H
-#define _PORT_SYS_TYPES_H
+#define _LIBSPL_SYS_TYPES_H
 
 #include <sys/isa_defs.h>
 #include <sys/feature_tests.h>

lib/libspl/include/sys/uio.h

@@ -37,8 +37,8 @@
  * contributors.
  */
 
-#ifndef _SOL_SYS_UIO_H
+#ifndef _LIBSPL_SYS_UIO_H
-#define	_SOL_SYS_UIO_H
+#define	_LIBSPL_SYS_UIO_H
 
 /* struct iovec is defined in glibc's sys/uio.h */
 #include_next <sys/uio.h>

lib/libspl/include/sys/varargs.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_VARARGS_H
+#ifndef _LIBSPL_SYS_VARARGS_H
-#define _SOL_SYS_VARARGS_H
+#define _LIBSPL_SYS_VARARGS_H
 
 #endif

lib/libspl/include/sys/zone.h

@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_SYS_ZONE_H
+#ifndef _LIBSPL_SYS_ZONE_H
-#define _SOL_SYS_ZONE_H
+#define _LIBSPL_SYS_ZONE_H
 
 #endif

lib/libspl/include/ucred.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_UCRED_H
+#ifndef _LIBSPL_UCRED_H
-#define _SOL_UCRED_H
+#define _LIBSPL_UCRED_H
 
 typedef int ucred_t;
 

lib/libspl/include/umem.h

@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _SOL_UMEM_H
+#ifndef _LIBSPL_UMEM_H
-#define _SOL_UMEM_H
+#define _LIBSPL_UMEM_H
 
 /* XXX: We should use the real portable umem library if it is detected
  * at configure time.  However, if the library is not available we can

lib/libspl/include/unistd.h

@@ -26,8 +26,8 @@
 
 #include_next <unistd.h>
 
-#ifndef _SYS_UNISTD_H
+#ifndef _LIBSPL_UNISTD_H
-#define _SYS_UNISTD_H
+#define _LIBSPL_UNISTD_H
 
 #include <zfs_config.h>
 
@@ -56,4 +56,4 @@ static inline long fake_gethostid(void)
 #define gethostid() fake_gethostid()
 #endif
 
-#endif /* _SYS_UNISTD_H */
+#endif /* _LIBSPL_UNISTD_H */

lib/libspl/include/zone.h

@@ -23,8 +23,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _ZONE_H
+#ifndef _LIBSPL_ZONE_H
-#define	_ZONE_H
+#define	_LIBSPL_ZONE_H
 
 
 
@@ -83,4 +83,4 @@ extern int	zone_list_datalink(zoneid_t, int *, char *);
 }
 #endif
 
-#endif /* _ZONE_H */
+#endif /* _LIBSPL_ZONE_H */